Be careful to include postgres.h *before* any system headers, to ensure

that the right flavors of largefile-related definitions are seen.
Most of these changes are probably unnecessary, but better safe than
sorry.

8 files changed, 16 insertions, 17 deletions

diff --git a/contrib/cube/cubeparse.y b/contrib/cube/cubeparse.y
index 887528eb03d..6aba226c70b 100644
--- a/contrib/cube/cubeparse.y
+++ b/contrib/cube/cubeparse.y
@@ -7,11 +7,11 @@
 #define YYSTYPE char *
 #define YYDEBUG 1
 
-#include <string.h>
+#include "postgres.h"
+
 #include "cubedata.h"
 #include "buffer.h"
 
-#include "postgres.h"
 #include "utils/palloc.h"
 #include "utils/elog.h"
 
diff --git a/contrib/cube/cubescan.l b/contrib/cube/cubescan.l
index d160937c2f7..6fc51e81142 100644
--- a/contrib/cube/cubescan.l
+++ b/contrib/cube/cubescan.l
@@ -6,7 +6,8 @@
 #define YYSTYPE char *
 #define yylval cube_yylval
 
-#include <stdio.h>
+#include "postgres.h"
+
 #include "cubeparse.h"
 #include "buffer.h"
 
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 899143adab3..7718b65f33c 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -26,9 +26,8 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  */
-
-#include <string.h>
 #include "postgres.h"
+
 #include "libpq-fe.h"
 #include "libpq-int.h"
 #include "fmgr.h"
diff --git a/contrib/dbmirror/pending.c b/contrib/dbmirror/pending.c
index 4164704abe3..d62da430d19 100644
--- a/contrib/dbmirror/pending.c
+++ b/contrib/dbmirror/pending.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  * pending.c
- * $Id: pending.c,v 1.3 2002/09/04 22:49:22 petere Exp $
+ * $Id: pending.c,v 1.4 2002/09/05 00:43:06 tgl Exp $
  *
  * This file contains a trigger for Postgresql-7.x to record changes to tables
  * to a pending table for mirroring.
@@ -18,9 +18,10 @@
  *
  *
  ***************************************************************************/
+#include <postgres.h>
+
 #include <executor/spi.h>
 #include <commands/trigger.h>
-#include <postgres.h>
 
 enum FieldUsage
 {
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.h b/contrib/fuzzystrmatch/fuzzystrmatch.h
index 59e0d9258c9..c8dbddeb076 100644
--- a/contrib/fuzzystrmatch/fuzzystrmatch.h
+++ b/contrib/fuzzystrmatch/fuzzystrmatch.h
@@ -42,11 +42,10 @@
 #ifndef FUZZYSTRMATCH_H
 #define FUZZYSTRMATCH_H
 
-#include <stdio.h>
-#include <string.h>
+#include "postgres.h"
+
 #include <ctype.h>
 
-#include "postgres.h"
 #include "fmgr.h"
 #include "utils/builtins.h"
 
diff --git a/contrib/seg/segscan.l b/contrib/seg/segscan.l
index 787fe28843c..271168d9f16 100644
--- a/contrib/seg/segscan.l
+++ b/contrib/seg/segscan.l
@@ -3,8 +3,8 @@
 ** A scanner for EMP-style numeric ranges 
 */
 
-#include <string.h>
-#include <stdio.h>
+#include "postgres.h"
+
 #include "segparse.h"
 #include "buffer.h"
 
diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index f620e61d5dc..254aa6c5c83 100644
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -25,11 +25,10 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  */
-#include <stdlib.h>
-#include <math.h>
-
 #include "postgres.h"
 
+#include <math.h>
+
 #include "fmgr.h"
 #include "funcapi.h"
 #include "executor/spi.h"
diff --git a/contrib/tsearch/parser.l b/contrib/tsearch/parser.l
index f30fbcd4f46..fb34aac7137 100644
--- a/contrib/tsearch/parser.l
+++ b/contrib/tsearch/parser.l
@@ -1,10 +1,10 @@
 %{
-#include <string.h>
+#include "postgres.h"
+
 #include "deflex.h"
 #include "parser.h"
 
 /* postgres allocation function */
-#include "postgres.h"
 #define free    pfree
 #define malloc  palloc
 #define realloc repalloc