From 8164fb88875c7160dbdb9480df7e24eccfb356fb Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 26 Oct 2007 13:30:10 +0000
Subject: [PATCH] Avoid including any backend-only stuff in the zic utility
 program. Per gripe from Zdenek Kotala, though not exactly his patch.

---
 src/timezone/ialloc.c    | 4 ++--
 src/timezone/localtime.c | 5 +++--
 src/timezone/scheck.c    | 4 ++--
 src/timezone/zic.c       | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/timezone/ialloc.c b/src/timezone/ialloc.c
index 2b4dc17b3bd..554e0854191 100644
--- a/src/timezone/ialloc.c
+++ b/src/timezone/ialloc.c
@@ -3,10 +3,10 @@
  * 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/timezone/ialloc.c,v 1.8 2007/01/26 17:45:42 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/timezone/ialloc.c,v 1.9 2007/10/26 13:30:10 tgl Exp $
  */
 
-#include "postgres.h"
+#include "postgres_fe.h"
 
 #include "private.h"
 
diff --git a/src/timezone/localtime.c b/src/timezone/localtime.c
index 774d83a2f6f..0deb63a2c46 100644
--- a/src/timezone/localtime.c
+++ b/src/timezone/localtime.c
@@ -3,7 +3,7 @@
  * 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/timezone/localtime.c,v 1.17 2007/08/04 19:29:25 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/timezone/localtime.c,v 1.18 2007/10/26 13:30:10 tgl Exp $
  */
 
 /*
@@ -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 218d2467d5e..230fefc6c43 100644
--- a/src/timezone/scheck.c
+++ b/src/timezone/scheck.c
@@ -3,10 +3,10 @@
  * 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/timezone/scheck.c,v 1.7 2005/10/15 02:49:51 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/timezone/scheck.c,v 1.8 2007/10/26 13:30:10 tgl Exp $
  */
 
-#include "postgres.h"
+#include "postgres_fe.h"
 
 #include "private.h"
 
diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index 08237965e4f..2c553c0b120 100644
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -3,10 +3,10 @@
  * 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/timezone/zic.c,v 1.21 2007/02/01 19:10:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/timezone/zic.c,v 1.22 2007/10/26 13:30:10 tgl Exp $
  */
 
-#include "postgres.h"
+#include "postgres_fe.h"
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
-- 
GitLab