Added support for PostgreSQL head, as suggested by Michael Fuhr.

Cleaned up includes.

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

diff --git a/CHANGES b/CHANGES
index f3a14c332068a5bd07f5c2b79f5dd95cb56fc4bd..3e9aec8092fe04ddd61281cc9198fcc28f7dfa10 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -25,8 +25,13 @@ PostGIS 1.1.0CVS
        - Stricter mapping between DBF and SQL integer and string attributes
        - Changed M() and Z() functions to return NULL if requested
          dimension is not available
+       - Initial support for postgresql 8.2
 
-PostGIS 1.0.5CVS
+PostGIS 1.0.6CVS
+       - Fixed palloc(0) call in collection deserializer (only gives
+         problem with --enable-cassert)
+
+PostGIS 1.0.5
 2005/11/25
        - New "Reporting Bugs" chapter in manual
        - Segfault fix in shp2pgsql (utf8 encoding)

diff --git a/Makefile.config.in b/Makefile.config.in
index edc2b0cf54da94bc8d77f6cdf3bd2c38e618ab6e..c5cf6e7a80fe48a351f3604eaddba3d5e9d7fd94 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -165,7 +165,11 @@ else
                                ifneq ($(findstring 8.0,$(VERSION)),)
                                        USE_VERSION=80
                                else
-                                       USE_VERSION=81
+                                       ifneq ($(findstring 8.1,$(VERSION)),)
+                                               USE_VERSION=81
+                                       else
+                                               USE_VERSION=82
+                                       endif
                                endif
                        endif
                endif

diff --git a/lwgeom/lwgeom_box2dfloat4.c b/lwgeom/lwgeom_box2dfloat4.c
index 7e8c44955fc968c8541e3094d3564b112c56f3b8..a1077f1ba33392389c2f3550f1b3c775c7160d8d 100644 (file)
--- a/lwgeom/lwgeom_box2dfloat4.c
+++ b/lwgeom/lwgeom_box2dfloat4.c
@@ -7,7 +7,6 @@
 #include "postgres.h"
 #include "access/gist.h"
 #include "access/itup.h"
-#include "access/rtree.h"
 #include "fmgr.h"
 #include "utils/elog.h"
 #include "utils/geo_decls.h"

diff --git a/lwgeom/lwgeom_chip.c b/lwgeom/lwgeom_chip.c
index b540a0d57a7d69c295c9c5e801a3ebfed0d31fd9..3f1baceaa410938fc7a54b2507d60ee6c019f8b6 100644 (file)
--- a/lwgeom/lwgeom_chip.c
+++ b/lwgeom/lwgeom_chip.c
@@ -7,7 +7,6 @@
 #include "postgres.h"
 #include "access/gist.h"
 #include "access/itup.h"
-#include "access/rtree.h"
 #include "fmgr.h"
 #include "utils/elog.h"
 

diff --git a/lwgeom/lwgeom_functions_basic.c b/lwgeom/lwgeom_functions_basic.c
index 96566fa4ca708f790ccf710966628809eb47b74e..7f869a3bd0e5fdd85c8609382af9b8bea89a5049 100644 (file)
--- a/lwgeom/lwgeom_functions_basic.c
+++ b/lwgeom/lwgeom_functions_basic.c
@@ -2101,7 +2101,7 @@ Datum LWGEOM_accum(PG_FUNCTION_ARGS)
         */
        ++nelems;
        if ( nelems == 1 || ! array ) {
-               nbytes = ARR_OVERHEAD(1)+INTALIGN(geom->size);
+               nbytes = ARR_OVERHEAD_NONULLS(1)+INTALIGN(geom->size);
 #ifdef PGIS_DEBUG
                elog(NOTICE, "geom_accum: adding %p (nelems=%d; nbytes=%d)",
                        geom, nelems, nbytes);
@@ -2118,6 +2118,9 @@ Datum LWGEOM_accum(PG_FUNCTION_ARGS)
 
 #if USE_VERSION > 72
                result->elemtype = oid;
+#endif
+#if USE_VERSION > 81
+               result->dataoffset = 0;
 #endif
                memcpy(ARR_DIMS(result), &nelems, sizeof(int));
                memcpy(ARR_LBOUND(result), &lbs, sizeof(int));
@@ -2208,7 +2211,7 @@ Datum LWGEOM_collect_garray(PG_FUNCTION_ARGS)
 
 #ifdef PGIS_DEBUG
        elog(NOTICE, " array is %d-bytes in size, %d w/out header",
-               array->size, array->size-ARR_OVERHEAD(ARR_NDIM(array)));
+               array->size, array->size-ARR_OVERHEAD_NONULLS(ARR_NDIM(array)));
 #endif
 
 

diff --git a/lwgeom/lwgeom_gist.c b/lwgeom/lwgeom_gist.c
index bc1a9fead05ef03ce3101a98c0715a4773819064..a9c86e013d21394ba085f6a2b73a2083911260c7 100644 (file)
--- a/lwgeom/lwgeom_gist.c
+++ b/lwgeom/lwgeom_gist.c
@@ -8,7 +8,7 @@
 #include "access/gist.h"
 #include "access/itup.h"
 #if USE_VERSION > 80
-#include "access/rtree.h"
+#include "access/skey.h"
 #endif
 #include "fmgr.h"
 #include "utils/elog.h"

diff --git a/lwgeom/lwgeom_inout.c b/lwgeom/lwgeom_inout.c
index e41604e80fea30a7d585212ce67ed8d50777047d..866f8651397a4a35f71e8a8907fb03777eb9b678 100644 (file)
--- a/lwgeom/lwgeom_inout.c
+++ b/lwgeom/lwgeom_inout.c
@@ -10,7 +10,6 @@
 
 #include "access/gist.h"
 #include "access/itup.h"
-#include "access/rtree.h"
 
 #include "fmgr.h"
 #include "utils/elog.h"

diff --git a/lwgeom/lwgeom_ogc.c b/lwgeom/lwgeom_ogc.c
index 056e32e60bf49ac13fd2aa8560d00a69335b762d..418a1d3b812b65b6b6d0d32f297ea3bb7be05fd0 100644 (file)
--- a/lwgeom/lwgeom_ogc.c
+++ b/lwgeom/lwgeom_ogc.c
@@ -8,7 +8,6 @@
 
 #include "access/gist.h"
 #include "access/itup.h"
-#include "access/rtree.h"
 
 #include "fmgr.h"
 #include "utils/elog.h"

diff --git a/lwgeom/lwgeom_pg.h b/lwgeom/lwgeom_pg.h
index 2d9b563aaf1843172af50404b2240d6472ebfccf..952e9faad0f51c68b843d83e581c9d5e92ece778 100644 (file)
--- a/lwgeom/lwgeom_pg.h
+++ b/lwgeom/lwgeom_pg.h
@@ -11,6 +11,10 @@
 #define PG_NARGS() (fcinfo->nargs)
 #endif
 
+#if USE_VERSION < 82 
+#define ARR_OVERHEAD_NONULLS(x) ARR_OVERHEAD((x))
+#endif
+
 void *pg_alloc(size_t size);
 void *pg_realloc(void *ptr, size_t size);
 void pg_free(void *ptr);

diff --git a/lwgeom/lwgeom_spheroid.c b/lwgeom/lwgeom_spheroid.c
index d3dda2af4bfe44bb12752cded59a502e72425fdf..01c54a11d073b3ed8f218cfd4857a8dedf912e50 100644 (file)
--- a/lwgeom/lwgeom_spheroid.c
+++ b/lwgeom/lwgeom_spheroid.c
@@ -21,13 +21,10 @@
 
 #include "access/gist.h"
 #include "access/itup.h"
-#include "access/rtree.h"
-
 
 #include "fmgr.h"
 #include "utils/elog.h"
 
-
 #include "liblwgeom.h"
 #include "lwgeom_pg.h"