Revert part of recent include patch not ready for application.

diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 0c9b44e2c1d5d48b428abd10f352773df362fe98..7a3b1439e4d73564a08eebe01ad3b9d77b3e2407 100644 (file)
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -48,6 +48,7 @@
 #endif
 
 #include "libpq-fe.h"
+#include "libpq-int.h"
 #include "fe-auth.h"
 #include "libpq/md5.h"
 
@@ -57,6 +58,7 @@
  * MIT Kerberos authentication system - protocol version 5
  */
 
+#include <krb5.h>
 /* Some old versions of Kerberos do not include <com_err.h> in <krb5.h> */
 #if !defined(__COM_ERR_H) && !defined(__COM_ERR_H__)
 #include <com_err.h>

diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
index 161251476bc3b8f1ab4398aad7a7693bc2272cc4..2064638a6a74de418110de811a6014a12ae1d577 100644 (file)
--- a/src/interfaces/libpq/fe-print.c
+++ b/src/interfaces/libpq/fe-print.c
@@ -35,6 +35,7 @@
 
 #include "libpq-fe.h"
 #include "libpq-int.h"
+#include "pqsignal.h"
 
 
 static void do_field(const PQprintOpt *po, const PGresult *res,

diff --git a/src/interfaces/libpq/fe-protocol2.c b/src/interfaces/libpq/fe-protocol2.c
index 67a18e23c81efac19bfdac13a98b1167529298a2..780db0f6e34e5df09f5f0cfd5749bb131779713e 100644 (file)
--- a/src/interfaces/libpq/fe-protocol2.c
+++ b/src/interfaces/libpq/fe-protocol2.c
@@ -21,6 +21,7 @@
 #include "libpq-fe.h"
 #include "libpq-int.h"
 
+#include "mb/pg_wchar.h"
 
 #ifdef WIN32
 #include "win32.h"

diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index 3612335246be3768b8db00faa19f0129cee2d691..61d38658ad0ff43624bef29b7878752c3f266db0 100644 (file)
--- a/src/interfaces/libpq/fe-secure.c
+++ b/src/interfaces/libpq/fe-secure.c
@@ -84,7 +84,9 @@
 #include <ctype.h>
 
 #include "libpq-fe.h"
+#include "libpq-int.h"
 #include "fe-auth.h"
+#include "pqsignal.h"
 
 #ifdef WIN32
 #include "win32.h"

diff --git a/src/port/strdup.c b/src/port/strdup.c
index 92faf10f7b6c034cf435db39cea31bbe9f7ad45a..40cd435d41de7c24be52977259b63e05c13007d7 100644 (file)
--- a/src/port/strdup.c
+++ b/src/port/strdup.c
@@ -15,6 +15,7 @@
 
 #include "c.h"
 
+#include "strdup.h"
 
 
 char *

diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index ba697fb20d5a767fe6a05a72e34ab7e0d0065c8b..69c34db482c0213f7ce17e2e51665f7cdacb0c1d 100644 (file)
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -19,10 +19,12 @@
 #include <time.h>
 
 #include "miscadmin.h"
+#include "pgtime.h"
 #include "pgtz.h"
 #include "storage/fd.h"
 #include "tzfile.h"
 #include "utils/datetime.h"
+#include "utils/elog.h"
 #include "utils/guc.h"
 #include "utils/hsearch.h"
 

diff --git a/src/timezone/strftime.c b/src/timezone/strftime.c
index c9444189aa3f0dd43eb37ec77d19458c662999c2..6858b848e05afc84f6f29010df3156f20afb8be2 100644 (file)
--- a/src/timezone/strftime.c
+++ b/src/timezone/strftime.c
@@ -24,6 +24,7 @@
 #include <locale.h>
 
 #include "private.h"
+#include "pgtz.h"
 #include "tzfile.h"
 
 

diff --git a/src/tutorial/funcs_new.c b/src/tutorial/funcs_new.c
index a47eca1bf331c2e44feb1ee8ba11083f1d69fc62..3ab83c92bdeffd2c46040503e2b7998495a8f3d5 100644 (file)
--- a/src/tutorial/funcs_new.c
+++ b/src/tutorial/funcs_new.c
@@ -13,6 +13,7 @@
 
 #include "postgres.h"                  /* general Postgres declarations */
 
+#include "fmgr.h"                              /* for argument/result macros */
 #include "executor/executor.h" /* for GetAttributeByName() */
 #include "utils/geo_decls.h"   /* for point type */