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.

9 files changed, 25 insertions, 21 deletions

diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c
index ae4cbbf426f..807e4efba1f 100644
--- a/src/backend/optimizer/geqo/geqo_selection.c
+++ b/src/backend/optimizer/geqo/geqo_selection.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_selection.c,v 1.13 2002/06/20 20:29:29 momjian Exp $
+ * $Id: geqo_selection.c,v 1.14 2002/09/05 00:43:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,9 +34,10 @@
 /*															 */
 /*************************************************************/
 
+#include "postgres.h"
+
 #include <math.h>
 
-#include "postgres.h"
 #include "optimizer/geqo_copy.h"
 #include "optimizer/geqo_random.h"
 #include "optimizer/geqo_selection.h"
diff --git a/src/backend/optimizer/path/tidpath.c b/src/backend/optimizer/path/tidpath.c
index c9ab25d626e..f8d4f79d4db 100644
--- a/src/backend/optimizer/path/tidpath.c
+++ b/src/backend/optimizer/path/tidpath.c
@@ -9,14 +9,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/tidpath.c,v 1.10 2002/06/20 20:29:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/tidpath.c,v 1.11 2002/09/05 00:43:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <math.h>
-
 #include "postgres.h"
 
+#include <math.h>
+
 #include "catalog/pg_operator.h"
 #include "optimizer/clauses.h"
 #include "optimizer/cost.h"
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index be1b5ad136c..c8d4ada5200 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -9,14 +9,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.22 2002/06/20 20:29:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.23 2002/09/05 00:43:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include "postgres.h"
 
 #include <ctype.h>
 
-#include "postgres.h"
 #include "miscadmin.h"
 #include "parser/scansup.h"
 
diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c
index 8cbf3327da1..38a06b6dc6f 100644
--- a/src/backend/port/dynloader/hpux.c
+++ b/src/backend/port/dynloader/hpux.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.20 2002/06/20 20:29:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.21 2002/09/05 00:43:07 tgl Exp $
  *
  *	NOTES
  *		all functions are defined here -- it's impossible to trace the
@@ -16,11 +16,11 @@
  *
  *-------------------------------------------------------------------------
  */
+#include "postgres.h"
+
 /* System includes */
 #include <a.out.h>
 
-#include "postgres.h"
-
 #include "dl.h"
 #include "dynloader.h"
 #include "utils/dynamic_loader.h"
diff --git a/src/backend/port/dynloader/nextstep.c b/src/backend/port/dynloader/nextstep.c
index c7339636073..a96b394cda6 100644
--- a/src/backend/port/dynloader/nextstep.c
+++ b/src/backend/port/dynloader/nextstep.c
@@ -1,5 +1,8 @@
+#include "postgres.h"
+
 #include "mach-o/rld.h"
 #include "streams/streams.h"
+
 #include <stdlib.h>
 
 static char *lastError = NULL;
diff --git a/src/backend/port/nextstep/port.c b/src/backend/port/nextstep/port.c
index 6ef1b126f4b..0271a3287af 100644
--- a/src/backend/port/nextstep/port.c
+++ b/src/backend/port/nextstep/port.c
@@ -1,11 +1,11 @@
+#include "postgres.h"
+
 #ifndef _POSIX_SOURCE
 #include "libc.h"
 #else
 #include <unistd.h>
-#include <stdlib.h>
 #endif
 
-#include <string.h>
 #include <sys/signal.h>
 
 
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index e518897b348..7e78793a404 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.13 2002/06/20 20:29:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.14 2002/09/05 00:43:07 tgl Exp $
  *
  * NOTES:
  *
@@ -32,10 +32,10 @@
  *-------------------------------------------------------------------------
  */
 
-#include <errno.h>
-
 #include "postgres.h"
 
+#include <errno.h>
+
 #include "storage/fd.h"
 #include "storage/buffile.h"
 
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index c19cbc42cf6..68917a64d60 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -8,17 +8,17 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.65 2002/09/04 20:31:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.66 2002/09/05 00:43:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include "postgres.h"
+
 #include <math.h>
 #include <limits.h>
 #include <float.h>
 #include <ctype.h>
 
-#include "postgres.h"
-
 #include "utils/geo_decls.h"
 
 #ifndef PI
diff --git a/src/backend/utils/adt/quote.c b/src/backend/utils/adt/quote.c
index d41856c8478..72f32b6cec4 100644
--- a/src/backend/utils/adt/quote.c
+++ b/src/backend/utils/adt/quote.c
@@ -7,14 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/quote.c,v 1.9 2002/09/03 21:45:42 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/quote.c,v 1.10 2002/09/05 00:43:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <ctype.h>
-
 #include "postgres.h"
 
+#include <ctype.h>
+
 #include "mb/pg_wchar.h"
 #include "utils/builtins.h"