Avoid including any backend-only stuff in the zic utility program.

Per gripe from Zdenek Kotala, though not exactly his patch.

diff --git a/src/timezone/ialloc.c b/src/timezone/ialloc.c
index c4bc22ad24fcd5219971b9170f2d2232d12e27d0..cecaf10b8739b307643d70d0d11755f383ff9af6 100644 (file)
--- a/src/timezone/ialloc.c
+++ b/src/timezone/ialloc.c
@@ -6,7 +6,7 @@
  *       $PostgreSQL$
  */
 
-#include "postgres.h"
+#include "postgres_fe.h"
 
 #include "private.h"
 

diff --git a/src/timezone/localtime.c b/src/timezone/localtime.c
index 862d2980bd8ea76ff32ef09969e0217e806b748d..831a6b10ee2085a0f3575b4004f9abe618c92869 100644 (file)
--- a/src/timezone/localtime.c
+++ b/src/timezone/localtime.c
@@ -12,7 +12,8 @@
  * (guy@auspex.com).
  */
 
-#include "postgres.h"
+/* this file needs to build in both frontend and backend contexts */
+#include "c.h"
 
 #include <fcntl.h>
 

diff --git a/src/timezone/scheck.c b/src/timezone/scheck.c
index 9cafd372f31c40bf74de8ee6da2fe51cef81ebde..c3f92785c06d976ef4a0b7e1c8a8df432542ca64 100644 (file)
--- a/src/timezone/scheck.c
+++ b/src/timezone/scheck.c
@@ -6,7 +6,7 @@
  *       $PostgreSQL$
  */
 
-#include "postgres.h"
+#include "postgres_fe.h"
 
 #include "private.h"
 

diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index 08a7d89ce99186a5e8bb100a1a2ff44251e835b4..70b8b9928cd9fe0ec5bdb7c744ab1a0301190774 100644 (file)
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -6,7 +6,7 @@
  *       $PostgreSQL$
  */
 
-#include "postgres.h"
+#include "postgres_fe.h"
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>