Drop postgis_config.h include from lwgeom_pg.h header.

Generally, package config files should _not_ be included
by package headers. In this specific case the aim is overriding
POSTGIS_DEBUG_LEVEL in implementation files for the sake of
enabling debugging of a single file.

Also part of this commit is addition of copyright header in
two files which were missing it (used git history to figure
assignments)

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

diff --git a/liblwgeom/lwgeom_transform.c b/liblwgeom/lwgeom_transform.c
index 76884c46675d0b267ef4746a6b6a52eb66b9d073..00853de2a16f68663b72953e8532cdeffc3744f3 100644 (file)
--- a/liblwgeom/lwgeom_transform.c
+++ b/liblwgeom/lwgeom_transform.c
@@ -10,6 +10,7 @@
  *
  **********************************************************************/
 
+#include "../postgis_config.h"
 #include "liblwgeom.h"
 #include "lwgeom_log.h"
 #include <string.h>

diff --git a/libpgcommon/lwgeom_pg.h b/libpgcommon/lwgeom_pg.h
index b512ac0448dd7888bf49c0533a265def5bfa46b0..9333a0f008d2c72d8579ca7ae7051e3779bd78b5 100644 (file)
--- a/libpgcommon/lwgeom_pg.h
+++ b/libpgcommon/lwgeom_pg.h
@@ -19,8 +19,6 @@
 #include "utils/geo_decls.h"
 #include "fmgr.h"
 
-#include "../postgis_config.h"
-
 #include "liblwgeom.h"
 #include "pgsql_compat.h"
 

diff --git a/libpgcommon/lwgeom_transform.c b/libpgcommon/lwgeom_transform.c
index cb7545a29aa2e370b0c117b554f73fe6ff2b84b4..07bba1811cb034b1cf5f5d29ce5557c75d6ef394 100644 (file)
--- a/libpgcommon/lwgeom_transform.c
+++ b/libpgcommon/lwgeom_transform.c
@@ -21,6 +21,7 @@
 #include "utils/hsearch.h"
 
 /* PostGIS headers */
+#include "../postgis_config.h"
 #include "liblwgeom.h"
 #include "lwgeom_pg.h"
 #include "lwgeom_transform.h"

diff --git a/postgis/geography_estimate.c b/postgis/geography_estimate.c
index 9f8c9129640d3d4433f9d290ae7bf86ca200184c..6e7854bed62c2bcbff9c2d84b554e0aef8294a1a 100644 (file)
--- a/postgis/geography_estimate.c
+++ b/postgis/geography_estimate.c
@@ -19,6 +19,7 @@
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
+#include "../postgis_config.h"
 #include "liblwgeom.h"
 #include "lwgeom_pg.h"
 

diff --git a/postgis/geometry_estimate.c b/postgis/geometry_estimate.c
index 5f568ffce883c8580fb76a08e61650263a550dcb..489c70ae0e49f6c026ffcacef6d7240055992938 100644 (file)
--- a/postgis/geometry_estimate.c
+++ b/postgis/geometry_estimate.c
@@ -22,6 +22,7 @@
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
+#include "../postgis_config.h"
 #include "liblwgeom.h"
 #include "lwgeom_pg.h"       /* For debugging macros. */
 #include "gserialized_gist.h" /* For index common functions */

diff --git a/postgis/long_xact.c b/postgis/long_xact.c
index ef1666de81dc92b3aaabe7dc7ede8081e30c8ce3..afaf042dda06a1000048ecfd833cf16ae664e6bf 100644 (file)
--- a/postgis/long_xact.c
+++ b/postgis/long_xact.c
@@ -16,6 +16,7 @@
 #include "commands/trigger.h"   /* ... and triggers */
 #include "utils/lsyscache.h"   /* for get_namespace_name() */
 
+#include "../postgis_config.h"
 #include "lwgeom_pg.h"
 
 #define ABORT_ON_AUTH_FAILURE 1

diff --git a/postgis/lwgeom_accum.c b/postgis/lwgeom_accum.c
index b5f6b1c2f98ac7abe7167a210f4caef0074c5468..943e4eb4b9edb639ca51eaa8b2d6602571e53f6d 100644 (file)
--- a/postgis/lwgeom_accum.c
+++ b/postgis/lwgeom_accum.c
@@ -17,6 +17,8 @@
 #include "utils/array.h"
 #include "utils/lsyscache.h"
 
+#include "../postgis_config.h"
+
 #include "liblwgeom.h"
 #include "lwgeom_pg.h"
 

diff --git a/postgis/lwgeom_box.c b/postgis/lwgeom_box.c
index 650057f5aa60413500df3932307104ca05bcef5c..cf3063fdd9aac1dd1dceb7b3b0ed35e5e735e977 100644 (file)
--- a/postgis/lwgeom_box.c
+++ b/postgis/lwgeom_box.c
@@ -18,6 +18,7 @@
 #include "utils/elog.h"
 #include "utils/geo_decls.h"
 
+#include "../postgis_config.h"
 #include "lwgeom_pg.h"
 #include "liblwgeom.h"
 #include "liblwgeom_internal.h"

diff --git a/postgis/lwgeom_box3d.c b/postgis/lwgeom_box3d.c
index 2c3fcfafb61927898ffd5bdba8445073e5895052..73e9a98078803a3239a277784d42587cf271adea 100644 (file)
--- a/postgis/lwgeom_box3d.c
+++ b/postgis/lwgeom_box3d.c
@@ -9,6 +9,7 @@
 #include "utils/elog.h"
 #include "utils/geo_decls.h"
 
+#include "../postgis_config.h"
 #include "lwgeom_pg.h"
 #include "liblwgeom.h"
 #include "liblwgeom_internal.h"

diff --git a/postgis/lwgeom_btree.c b/postgis/lwgeom_btree.c
index d2994827ba9c08e180a1555071f4e19e8ef129a9..12bc1162ce07c439182c67d574708c7253c8d841 100644 (file)
--- a/postgis/lwgeom_btree.c
+++ b/postgis/lwgeom_btree.c
@@ -1,6 +1,16 @@
-/***********************************************************
+/**********************************************************************
  *
- * $Id$
+ * PostGIS - Spatial Types for PostgreSQL
+ * http://postgis.refractions.net
+ *
+ * Copyright (C) 2010 Olivier Courtin <olivier.courtin@oslandia.com>
+ * Copyright (C) 2010 Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
+ * Copyright (C) 2009-2011 Paul Ramsey <pramsey@cleverelephant.ca>
+ *
+ * This is free software; you can redistribute and/or modify it under
+ * the terms of the GNU General Public Licence. See the COPYING file.
+ *
+ **********************************************************************
  *
  * Comparision function for use in Binary Tree searches
  * (ORDER BY, GROUP BY, DISTINCT)
@@ -11,6 +21,7 @@
 #include "fmgr.h"
 #include "utils/geo_decls.h"
 
+#include "../postgis_config.h"
 #include "liblwgeom.h"
 #include "lwgeom_pg.h"
 

diff --git a/postgis/lwgeom_cache.c b/postgis/lwgeom_cache.c
index 400ad314fd29737c7a20940806c73ded1026d05e..7f470fc6b06e4232a606fff315815738987d5612 100644 (file)
--- a/postgis/lwgeom_cache.c
+++ b/postgis/lwgeom_cache.c
@@ -13,6 +13,7 @@
 #include "postgres.h"
 #include "fmgr.h"
 
+#include "../postgis_config.h"
 #include "lwgeom_cache.h"
 
 GeomCache* GetGeomCache(FunctionCallInfoData *fcinfo)

diff --git a/postgis/lwgeom_dump.c b/postgis/lwgeom_dump.c
index a84b74dd486b8de1668400912d41ed284f65b7c9..9af164a686f1bd9699636212b47c882373b67f6b 100644 (file)
--- a/postgis/lwgeom_dump.c
+++ b/postgis/lwgeom_dump.c
@@ -9,6 +9,14 @@
  * the terms of the GNU General Public Licence. See the COPYING file.
  *
  **********************************************************************/
+
+#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"
@@ -16,18 +24,10 @@
 #include "utils/geo_decls.h"
 #include "funcapi.h"
 
+#include "../postgis_config.h"
 #include "liblwgeom.h"
 #include "lwgeom_pg.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_export.c b/postgis/lwgeom_export.c
index f64f0c83e1a9371dcfe564fd9335a260b9dfa8d1..c95c0feb3f316d4569b9eb94dda8167c837202e2 100644 (file)
--- a/postgis/lwgeom_export.c
+++ b/postgis/lwgeom_export.c
@@ -17,6 +17,7 @@
 #include "postgres.h"\r
 #include "executor/spi.h"\r
 \r
+#include "../postgis_config.h"\r
 #include "lwgeom_pg.h"\r
 #include "liblwgeom.h"\r
 #include "lwgeom_export.h"\r

diff --git a/postgis/lwgeom_functions_lrs.c b/postgis/lwgeom_functions_lrs.c
index 7749076417c1803b2217b252b2e35d46a80f478d..5736bd553b5227b0860ddab9f354f264d74fd024 100644 (file)
--- a/postgis/lwgeom_functions_lrs.c
+++ b/postgis/lwgeom_functions_lrs.c
@@ -10,11 +10,14 @@
  *
  **********************************************************************/
 
+#include <math.h>
+
 #include "postgres.h"
 #include "fmgr.h"
+
+#include "../postgis_config.h"
 #include "liblwgeom.h"
 #include "lwgeom_pg.h"
-#include "math.h"
 
 /*
 * Add a measure dimension to a line, interpolating linearly from the

diff --git a/postgis/lwgeom_in_geojson.c b/postgis/lwgeom_in_geojson.c
index bb6cce151d1fe7d43cb39d99973c218ebd0614bf..b2bd76d78c98f3032005c3b85d11221bc058eb89 100644 (file)
--- a/postgis/lwgeom_in_geojson.c
+++ b/postgis/lwgeom_in_geojson.c
@@ -8,10 +8,13 @@
  *
  **********************************************************************/
 
+#include <assert.h>
+
 #include "postgres.h"
+
+#include "../postgis_config.h"
 #include "lwgeom_pg.h"
 #include "liblwgeom.h"
-#include <assert.h>
 
 Datum geom_from_geojson(PG_FUNCTION_ARGS);
 

diff --git a/postgis/lwgeom_in_gml.c b/postgis/lwgeom_in_gml.c
index 3c6fc9c615efc784dc7050722adbd7424ebaa7d6..4bb69d9b3d9f668124095e521668cb0894309cb4 100644 (file)
--- a/postgis/lwgeom_in_gml.c
+++ b/postgis/lwgeom_in_gml.c
@@ -34,18 +34,18 @@
 **********************************************************************/
 
 
-#include "postgres.h"
-#include "lwgeom_pg.h"
-#include "liblwgeom.h"
-#include "lwgeom_transform.h"
-#include "executor/spi.h"
-
-
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 
+#include "postgres.h"
+#include "executor/spi.h"
+
+#include "../postgis_config.h"
+#include "lwgeom_pg.h"
+#include "liblwgeom.h"
+#include "lwgeom_transform.h"
 
 
 Datum geom_from_gml(PG_FUNCTION_ARGS);

diff --git a/postgis/lwgeom_in_kml.c b/postgis/lwgeom_in_kml.c
index 50fa929487c44710bfcdbfeadf904161276de90b..6b01f2153dbc9f4ddce5ae42a608841e3c490c10 100644 (file)
--- a/postgis/lwgeom_in_kml.c
+++ b/postgis/lwgeom_in_kml.c
@@ -27,14 +27,16 @@
 **********************************************************************/
 
 
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+
 #include "postgres.h"
+
+#include "../postgis_config.h"
 #include "lwgeom_pg.h"
 #include "liblwgeom.h"
 
 
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-
 
 /*
 TODO:

diff --git a/postgis/lwgeom_ogc.c b/postgis/lwgeom_ogc.c
index 3a9219d0aafe586d5f1484a61495cc3854c88bbb..0e36419912ebff2109c83c85ee294dcf053414bd 100644 (file)
--- a/postgis/lwgeom_ogc.c
+++ b/postgis/lwgeom_ogc.c
@@ -24,6 +24,8 @@
 #include "fmgr.h"
 #include "utils/elog.h"
 
+#include "../postgis_config.h"
+
 #include "liblwgeom.h"
 #include "lwgeom_pg.h"
 

diff --git a/postgis/lwgeom_rtree.c b/postgis/lwgeom_rtree.c
index dff6810cb88c87f3dccb6f7b9cf3cab5fc42f90b..259962642d4d60d15555db41208fa9106323908d 100644 (file)
--- a/postgis/lwgeom_rtree.c
+++ b/postgis/lwgeom_rtree.c
@@ -11,6 +11,7 @@
 
 #include <assert.h>
 
+#include "../postgis_config.h"
 #include "lwgeom_pg.h"
 #include "liblwgeom.h"
 #include "liblwgeom_internal.h"         /* For FP comparators. */

diff --git a/postgis/lwgeom_spheroid.c b/postgis/lwgeom_spheroid.c
index ddbc7cb149b120a790713006c2b090a91885f0fe..453cafd25b40d14ea6869ec83213bb3300b1983f 100644 (file)
--- a/postgis/lwgeom_spheroid.c
+++ b/postgis/lwgeom_spheroid.c
@@ -25,6 +25,7 @@
 #include "fmgr.h"
 #include "utils/elog.h"
 
+#include "../postgis_config.h"
 #include "liblwgeom.h"
 #include "lwgeom_pg.h"
 

diff --git a/postgis/lwgeom_sqlmm.c b/postgis/lwgeom_sqlmm.c
index c3da5c64ee189b0f7a06feda3e3ee5ce032abf1d..37ec9f0ac9d47c925fd34daafa810e1a7a97e9c1 100644 (file)
--- a/postgis/lwgeom_sqlmm.c
+++ b/postgis/lwgeom_sqlmm.c
@@ -10,16 +10,17 @@
  *
  **********************************************************************/
 
-#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 "fmgr.h"
+
+#include "../postgis_config.h"
+#include "liblwgeom.h"
 #include "lwgeom_pg.h"
 
 

diff --git a/postgis/lwgeom_transform.c b/postgis/lwgeom_transform.c
index a006fdad0338a7967adbb4770a7d0e10b699e04d..a9abd1fbc813545351825755039ab522eaa9a619 100644 (file)
--- a/postgis/lwgeom_transform.c
+++ b/postgis/lwgeom_transform.c
@@ -13,6 +13,7 @@
 #include "postgres.h"
 #include "fmgr.h"
 
+#include "../postgis_config.h"
 #include "liblwgeom.h"
 #include "lwgeom_transform.h"
 

diff --git a/postgis/lwgeom_triggers.c b/postgis/lwgeom_triggers.c
index 294b89b55c23e6bafe8850c65220cccb94508be4..9f62afcb484796aca8eb09bb9c86fe2bdcea1c8e 100644 (file)
--- a/postgis/lwgeom_triggers.c
+++ b/postgis/lwgeom_triggers.c
@@ -1,6 +1,20 @@
+/**********************************************************************
+ *
+ * PostGIS - Spatial Types for PostgreSQL
+ * http://postgis.refractions.net
+ *
+ * Copyright (C) 2004 Refractions Research Inc.
+ *
+ * This is free software; you can redistribute and/or modify it under
+ * the terms of the GNU General Public Licence. See the COPYING file.
+ *
+ **********************************************************************/
+
 #include "postgres.h"
 #include "executor/spi.h"       /* this is what you need to work with SPI */
 #include "commands/trigger.h"   /* ... and triggers */
+
+#include "../postgis_config.h"
 #include "lwgeom_pg.h"
 
 Datum cache_bbox(PG_FUNCTION_ARGS);

diff --git a/postgis/postgis_module.c b/postgis/postgis_module.c
index 654b84b36b04072d7b24439ac3a5364c1998c21d..045386e942fc52f78cc0863cd92aacd2efb9bc9d 100644 (file)
--- a/postgis/postgis_module.c
+++ b/postgis/postgis_module.c
@@ -15,9 +15,9 @@
 #include "utils/elog.h"
 #include "utils/guc.h"
 
+#include "../postgis_config.h"
 #include "lwgeom_log.h"
 #include "lwgeom_pg.h"
-#include "../postgis_config.h"
 
 /*
  * This is required for builds against pgsql

diff --git a/raster/rt_pg/rt_pg.c b/raster/rt_pg/rt_pg.c
index 9a35386ffa2ac92c868b8e6cd7dd5f88341f32ec..a5ee09f4d12fd3435556fa286e48610ffe6df77b 100644 (file)
--- a/raster/rt_pg/rt_pg.c
+++ b/raster/rt_pg/rt_pg.c
@@ -46,6 +46,8 @@
 #include <executor/executor.h> /* for GetAttributeByName in RASTER_reclass */
 #include <funcapi.h>
 
+#include "../../postgis_config.h"
+
 #include "lwgeom_pg.h"
 #include "liblwgeom.h"
 #include "liblwgeom_internal.h" /* for clamp_srid() */