[postgis-commits] svn - r3841 - trunk/postgis
postgis-commits at postgis.refractions.net
postgis-commits at postgis.refractions.net
Tue Mar 10 13:15:27 PDT 2009
Author: mcayland
Date: 2009-03-10 13:15:27 -0700 (Tue, 10 Mar 2009)
New Revision: 3841
Modified:
trunk/postgis/long_xact.c
trunk/postgis/lwgeom_box2dfloat4.c
trunk/postgis/lwgeom_box3d.c
trunk/postgis/lwgeom_btree.c
trunk/postgis/lwgeom_chip.c
trunk/postgis/lwgeom_dump.c
trunk/postgis/lwgeom_estimate.c
trunk/postgis/lwgeom_functions_basic.c
trunk/postgis/lwgeom_geos.h
trunk/postgis/lwgeom_geos_prepared.h
trunk/postgis/lwgeom_gist.c
trunk/postgis/lwgeom_inout.c
trunk/postgis/lwgeom_pg.c
trunk/postgis/lwgeom_pg.h
trunk/postgis/lwgeom_sqlmm.c
trunk/postgis/lwgeom_transform.c
Log:
Commit Mateusz's patch to move the postgres.h #include to the top of the file in order to aid the MSVC build.
Modified: trunk/postgis/long_xact.c
===================================================================
--- trunk/postgis/long_xact.c 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/long_xact.c 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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
Modified: trunk/postgis/lwgeom_box2dfloat4.c
===================================================================
--- trunk/postgis/lwgeom_box2dfloat4.c 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_box2dfloat4.c 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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 */
Modified: trunk/postgis/lwgeom_box3d.c
===================================================================
--- trunk/postgis/lwgeom_box3d.c 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_box3d.c 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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,8 +12,12 @@
#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)
Modified: trunk/postgis/lwgeom_btree.c
===================================================================
--- trunk/postgis/lwgeom_btree.c 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_btree.c 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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);
Modified: trunk/postgis/lwgeom_chip.c
===================================================================
--- trunk/postgis/lwgeom_chip.c 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_chip.c 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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*/
Modified: trunk/postgis/lwgeom_dump.c
===================================================================
--- trunk/postgis/lwgeom_dump.c 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_dump.c 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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);
Modified: trunk/postgis/lwgeom_estimate.c
===================================================================
--- trunk/postgis/lwgeom_estimate.c 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_estimate.c 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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
*
Modified: trunk/postgis/lwgeom_functions_basic.c
===================================================================
--- trunk/postgis/lwgeom_functions_basic.c 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_functions_basic.c 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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);
Modified: trunk/postgis/lwgeom_geos.h
===================================================================
--- trunk/postgis/lwgeom_geos.h 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_geos.h 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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
Modified: trunk/postgis/lwgeom_geos_prepared.h
===================================================================
--- trunk/postgis/lwgeom_geos_prepared.h 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_geos_prepared.h 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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
Modified: trunk/postgis/lwgeom_gist.c
===================================================================
--- trunk/postgis/lwgeom_gist.c 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_gist.c 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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,11 +6,18 @@
#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 &&)
*/
Modified: trunk/postgis/lwgeom_inout.c
===================================================================
--- trunk/postgis/lwgeom_inout.c 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_inout.c 2009-03-10 20:15:27 UTC (rev 3841)
@@ -1,7 +1,7 @@
+#include "postgres.h"
+
#include "../postgis_config.h"
-#include "postgres.h"
-
#include <math.h>
#include <float.h>
#include <string.h>
Modified: trunk/postgis/lwgeom_pg.c
===================================================================
--- trunk/postgis/lwgeom_pg.c 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_pg.c 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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
Modified: trunk/postgis/lwgeom_pg.h
===================================================================
--- trunk/postgis/lwgeom_pg.h 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_pg.h 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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"
Modified: trunk/postgis/lwgeom_sqlmm.c
===================================================================
--- trunk/postgis/lwgeom_sqlmm.c 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_sqlmm.c 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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"
Modified: trunk/postgis/lwgeom_transform.c
===================================================================
--- trunk/postgis/lwgeom_transform.c 2009-03-10 20:15:22 UTC (rev 3840)
+++ trunk/postgis/lwgeom_transform.c 2009-03-10 20:15:27 UTC (rev 3841)
@@ -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,7 +17,13 @@
#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);
Datum postgis_proj_version(PG_FUNCTION_ARGS);
More information about the postgis-commits
mailing list