Commit Mateusz's patch to move the postgres.h #include to the top of the file in...

git-svn-id: http://svn.osgeo.org/postgis/trunk@3841 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/postgis/long_xact.c b/postgis/long_xact.c
index d88ff437a90511f937d3612c09d7a390e4483df2..aa1c42cb9b3c1ea53869c75720042663a53bd56f 100644 (file)
--- a/postgis/long_xact.c
+++ b/postgis/long_xact.c
@@ -1,11 +1,10 @@
-#include "lwgeom_pg.h"
-
 #include "postgres.h"
 #include "access/xact.h"
 #include "executor/spi.h"       /* this is what you need to work with SPI */
 #include "commands/trigger.h"   /* ... and triggers */
 #include "utils/lsyscache.h"   /* for get_namespace_name() */
 
+#include "lwgeom_pg.h"
 
 #define ABORT_ON_AUTH_FAILURE 1
 

diff --git a/postgis/lwgeom_box2dfloat4.c b/postgis/lwgeom_box2dfloat4.c
index f992187cd90b9d83898bc72db6c9770e2b5ee16c..8a0159e97f3b5db824ba2d5109b80936fe43624d 100644 (file)
--- a/postgis/lwgeom_box2dfloat4.c
+++ b/postgis/lwgeom_box2dfloat4.c
@@ -1,9 +1,3 @@
-#include <math.h>
-#include <float.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-
 #include "postgres.h"
 #include "access/gist.h"
 #include "access/itup.h"
@@ -14,6 +8,11 @@
 #include "lwgeom_pg.h"
 #include "liblwgeom.h"
 
+#include <math.h>
+#include <float.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
 
 
 /* forward defs */

diff --git a/postgis/lwgeom_box3d.c b/postgis/lwgeom_box3d.c
index 8d08bfa04fd5e14186a1622d292d1b81b819c044..1d430c4ad9fccb06da126b0456bca7394070c91f 100644 (file)
--- a/postgis/lwgeom_box3d.c
+++ b/postgis/lwgeom_box3d.c
@@ -4,12 +4,6 @@
  *
  **********************************************************************/
 
-#include <math.h>
-#include <float.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-
 #include "postgres.h"
 #include "fmgr.h"
 #include "utils/elog.h"
@@ -18,7 +12,11 @@
 #include "lwgeom_pg.h"
 #include "liblwgeom.h"
 
-
+#include <math.h>
+#include <float.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
 
 #define SHOW_DIGS_DOUBLE 15
 #define MAX_DIGS_DOUBLE (SHOW_DIGS_DOUBLE + 6 + 1 + 3 +1)

diff --git a/postgis/lwgeom_btree.c b/postgis/lwgeom_btree.c
index 9f20ed8a7d69c3bd35a63113c949d250b667adc8..f93f9d83ee8812cfdaea7e6f32f994a7fbe905d4 100644 (file)
--- a/postgis/lwgeom_btree.c
+++ b/postgis/lwgeom_btree.c
@@ -7,12 +7,6 @@
  *
  ***********************************************************/
 
-#include <math.h>
-#include <float.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-
 #include "postgres.h"
 #include "fmgr.h"
 #include "utils/geo_decls.h"
@@ -20,6 +14,12 @@
 #include "liblwgeom.h"
 #include "lwgeom_pg.h"
 
+#include <math.h>
+#include <float.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+
 Datum lwgeom_lt(PG_FUNCTION_ARGS);
 Datum lwgeom_le(PG_FUNCTION_ARGS);
 Datum lwgeom_eq(PG_FUNCTION_ARGS);

diff --git a/postgis/lwgeom_chip.c b/postgis/lwgeom_chip.c
index 86dab228a0686c03e30655b307be543ce3b3afe5..ae3ccc683d2abe7be1e3ba13e64fd56f9f4593a4 100644 (file)
--- a/postgis/lwgeom_chip.c
+++ b/postgis/lwgeom_chip.c
@@ -1,9 +1,3 @@
-#include <math.h>
-#include <float.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-
 #include "postgres.h"
 #include "access/gist.h"
 #include "access/itup.h"
@@ -14,6 +8,11 @@
 #include "lwgeom_pg.h"
 #include "liblwgeom.h"
 
+#include <math.h>
+#include <float.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
 
 /* Define this to debug CHIP ops */
 /*#define DEBUG_CHIP 1*/

diff --git a/postgis/lwgeom_dump.c b/postgis/lwgeom_dump.c
index 01c600bdb02e44cca82916e6f65b83e8226e56ea..821e6faa283ef0351661b57ca6daed557a5735f5 100644 (file)
--- a/postgis/lwgeom_dump.c
+++ b/postgis/lwgeom_dump.c
@@ -9,15 +9,6 @@
  * the terms of the GNU General Public Licence. See the COPYING file.
  * 
  **********************************************************************/
-#include "../postgis_config.h"
-
-#include <math.h>
-#include <float.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <assert.h>
-
 #include "postgres.h"
 #include "fmgr.h"
 #include "utils/elog.h"
@@ -29,6 +20,16 @@
 #include "lwgeom_pg.h"
 #include "profile.h"
 
+#include "../postgis_config.h"
+
+#include <math.h>
+#include <float.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <assert.h>
+
+
 Datum LWGEOM_dump(PG_FUNCTION_ARGS);
 Datum LWGEOM_dump_rings(PG_FUNCTION_ARGS);
 

diff --git a/postgis/lwgeom_estimate.c b/postgis/lwgeom_estimate.c
index 8c8552f59a511bf3a053536582898b5e6c9776c2..337b2e29c31f657f7579e8d6e2578a8adc043db4 100644 (file)
--- a/postgis/lwgeom_estimate.c
+++ b/postgis/lwgeom_estimate.c
@@ -10,13 +10,6 @@
  * 
  **********************************************************************/
 
-#include <math.h>
-#include <float.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <ctype.h>
-
 #include "postgres.h"
 #include "executor/spi.h"
 #include "fmgr.h"
@@ -30,6 +23,13 @@
 #include "liblwgeom.h"
 #include "lwgeom_pg.h"
 
+#include <math.h>
+#include <float.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <ctype.h>
+
 /*
  *     Assign a number to the postgis statistics kind
  *

diff --git a/postgis/lwgeom_functions_basic.c b/postgis/lwgeom_functions_basic.c
index e2afe46c69bf4c4b63942766fa2aa4a52fbf7c53..8a38af591a8ddc60c935e6fd787e73cce1c787cd 100644 (file)
--- a/postgis/lwgeom_functions_basic.c
+++ b/postgis/lwgeom_functions_basic.c
@@ -10,12 +10,6 @@
  *
  **********************************************************************/
 
-#include <math.h>
-#include <float.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-
 #include "postgres.h"
 #include "fmgr.h"
 #include "utils/elog.h"
@@ -27,6 +21,12 @@
 #include "lwgeom_pg.h"
 #include "profile.h"
 
+#include <math.h>
+#include <float.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+
 Datum LWGEOM_mem_size(PG_FUNCTION_ARGS);
 Datum LWGEOM_summary(PG_FUNCTION_ARGS);
 Datum LWGEOM_npoints(PG_FUNCTION_ARGS);

diff --git a/postgis/lwgeom_geos.h b/postgis/lwgeom_geos.h
index 5b528e41f6a89a97b3fe32bd8e63fb07e2351dfd..dccc0cc2831f4b5ccb0a7b947d2de33d4c96e1d9 100644 (file)
--- a/postgis/lwgeom_geos.h
+++ b/postgis/lwgeom_geos.h
@@ -10,10 +10,6 @@
  * 
  **********************************************************************/
 
-#include <string.h>
-
-#include "../postgis_config.h"
-
 #include "postgres.h"
 #include "fmgr.h"
 #include "miscadmin.h"
@@ -23,6 +19,8 @@
 #include "utils/memutils.h"
 #include "executor/spi.h"
 
+#include "../postgis_config.h"
+
 /* Workaround for GEOS 2.2 compatibility: old geos_c.h does not contain 
    header guards to protect from multiple inclusion */ 
 #ifndef GEOS_C_INCLUDED
@@ -34,6 +32,8 @@
 #include "liblwgeom.h"
 #include "profile.h"
 
+#include <string.h>
+
 #if POSTGIS_PROFILE > 0
 #warning POSTGIS_PROFILE enabled!
 #endif

diff --git a/postgis/lwgeom_geos_prepared.h b/postgis/lwgeom_geos_prepared.h
index 8306f2d9cf09fef32a7463c91636ddf7faaa9458..fed357018e6fc5aa23d5102327a6b2e8f0920874 100644 (file)
--- a/postgis/lwgeom_geos_prepared.h
+++ b/postgis/lwgeom_geos_prepared.h
@@ -10,8 +10,6 @@
  *
  **********************************************************************/
 
-#include "../postgis_config.h"
-
 #include "postgres.h"
 #include "fmgr.h"
 #include "miscadmin.h"
@@ -19,6 +17,8 @@
 #include "utils/memutils.h"
 #include "access/hash.h"
 
+#include "../postgis_config.h"
+
 /* Workaround for GEOS 2.2 compatibility: old geos_c.h does not contain
    header guards to protect from multiple inclusion */
 #ifndef GEOS_C_INCLUDED

diff --git a/postgis/lwgeom_gist.c b/postgis/lwgeom_gist.c
index 56fa17d22ddfdb9f48f2120866b221bd4df3ee4e..4a6410fbe94f5ef925a708a79d8683aa56b2ccd3 100644 (file)
--- a/postgis/lwgeom_gist.c
+++ b/postgis/lwgeom_gist.c
@@ -1,11 +1,3 @@
-#include <math.h>
-#include <float.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include "../postgis_config.h"
-
 #include "postgres.h"
 #include "access/gist.h"
 #include "access/itup.h"
@@ -14,10 +6,17 @@
 #include "fmgr.h"
 #include "utils/elog.h"
 
+#include "../postgis_config.h"
 #include "liblwgeom.h"
 
 #include "lwgeom_pg.h"
 
+#include <math.h>
+#include <float.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+
 
 /*
  * implementation GiST support and basic LWGEOM operations (like &&)

diff --git a/postgis/lwgeom_inout.c b/postgis/lwgeom_inout.c
index 0f488548be5a922f000060bd8e7ad43bba69b1c1..823fd677cae9e82ce3324b7dc2a80a20ce85dba1 100644 (file)
--- a/postgis/lwgeom_inout.c
+++ b/postgis/lwgeom_inout.c
@@ -1,7 +1,7 @@
-#include "../postgis_config.h"
-
 #include "postgres.h"
 
+#include "../postgis_config.h"
+
 #include <math.h>
 #include <float.h>
 #include <string.h>

diff --git a/postgis/lwgeom_pg.c b/postgis/lwgeom_pg.c
index ef48698155eb556626b51c3d631bf02bf17da771..8a17c635263579179a3a97f5c610e2d839a6c40f 100644 (file)
--- a/postgis/lwgeom_pg.c
+++ b/postgis/lwgeom_pg.c
@@ -1,14 +1,14 @@
-#include "../postgis_config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
 #include <postgres.h>
 #include <fmgr.h>
 #include <executor/spi.h>
+
+#include "../postgis_config.h"
 #include "liblwgeom.h"
 #include "lwgeom_pg.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
 
 #define PARANOIA_LEVEL 1
 

diff --git a/postgis/lwgeom_pg.h b/postgis/lwgeom_pg.h
index 08a8c3145ceb10d494268b2eee51fe6c60dd723d..fadeb6eef585de67ada294593c52319e4708e7a8 100644 (file)
--- a/postgis/lwgeom_pg.h
+++ b/postgis/lwgeom_pg.h
@@ -1,10 +1,12 @@
 #ifndef _LWGEOM_PG_H
 #define _LWGEOM_PG_H 1
 
-#include "../postgis_config.h"
 #include "postgres.h"
 #include "utils/geo_decls.h"
 #include "fmgr.h"
+
+#include "../postgis_config.h"
+
 #include "liblwgeom.h"
 #include "pgsql_compat.h"
 

diff --git a/postgis/lwgeom_sqlmm.c b/postgis/lwgeom_sqlmm.c
index 9cc1b060fb41c048749ac997580242ef94cd9f23..63d3692fb1deff72b3c3afa9858dedc080dbe967 100644 (file)
--- a/postgis/lwgeom_sqlmm.c
+++ b/postgis/lwgeom_sqlmm.c
@@ -10,16 +10,16 @@
  * 
  **********************************************************************/
 
+#include "postgres.h"
+#include "liblwgeom.h"
+#include "fmgr.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <math.h>
 
-#include "postgres.h"
-#include "liblwgeom.h"
-#include "fmgr.h"
-
 #include "lwgeom_pg.h"
 
 

diff --git a/postgis/lwgeom_transform.c b/postgis/lwgeom_transform.c
index c0edc25f178f51e1261c4fb5329f92260c2b3f64..bba63f2db7e80e5d990b6551b9fb30e4412884f2 100644 (file)
--- a/postgis/lwgeom_transform.c
+++ b/postgis/lwgeom_transform.c
@@ -10,12 +10,6 @@
  * 
  **********************************************************************/
 
-#include <math.h>
-#include <float.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-
 #include "postgres.h"
 #include "fmgr.h"
 #include "miscadmin.h"
@@ -23,6 +17,12 @@
 #include "liblwgeom.h"
 #include "lwgeom_pg.h"
 
+#include <math.h>
+#include <float.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+
 
 Datum transform(PG_FUNCTION_ARGS);
 Datum transform_geom(PG_FUNCTION_ARGS);