Remove GSERIALIZED_ON from .sql files.

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

diff --git a/liblwgeom/liblwgeom.h.in b/liblwgeom/liblwgeom.h.in
index 67fd0dee082608e69c9571486417e17368919f6a..5c01aa4606ef8e35507e5c49466b1a4146022dbb 100644 (file)
--- a/liblwgeom/liblwgeom.h.in
+++ b/liblwgeom/liblwgeom.h.in
@@ -22,6 +22,13 @@
 #include <stdint.h>
 #include "proj_api.h"
 
+/**
+* For now, until all the old code is pulled 
+* TODO: remove this
+*/
+#define GSERIALIZED_ON
+
+
 /**
 * @file liblwgeom.h
 *

diff --git a/libpgcommon/gserialized.h b/libpgcommon/gserialized.h
index 24d5b0510ec98f5aa781b6252e8ad6c6aa99a67a..139597f9cb07c5d48bed18984ec4747f4b4f3438 100644 (file)
--- a/libpgcommon/gserialized.h
+++ b/libpgcommon/gserialized.h
@@ -1,3 +1,2 @@
-#define GSERIALIZED_ON
 
 

diff --git a/libpgcommon/lwgeom_pg.h b/libpgcommon/lwgeom_pg.h
index c5626db9d765f9019a56fa463014a5d296f2ffe6..706511f7f47de0763d7f97807e0eb118ba4b16b3 100644 (file)
--- a/libpgcommon/lwgeom_pg.h
+++ b/libpgcommon/lwgeom_pg.h
@@ -100,7 +100,7 @@ extern void pg_unparser_errhint(LWGEOM_UNPARSER_RESULT *lwg_unparser_result);
 /*
 * Temporary changeover defines for PG_LWGEOM and GSERIALIZED
 */
-#include "gserialized.h"
+
 #ifdef GSERIALIZED_ON
 #define PG_LWGEOM GSERIALIZED
 #define BOX2DFLOAT4 GBOX

diff --git a/postgis/geography.h b/postgis/geography.h
index c8f12416a6a302f028a7ce6e79d2a1faaa54ad76..7ac481d1a4d754bb813698911bd1ea309339b869 100644 (file)
--- a/postgis/geography.h
+++ b/postgis/geography.h
@@ -31,7 +31,7 @@
 
 /**********************************************************************
 **  Useful functions for all GSERIALIZED handlers. 
-**  XXX move to gserialized.h eventually
+**  TODO: Move to common.h in pgcommon
 */
 
 /* Convert lwgeom to newly allocated gserialized */

diff --git a/postgis/geography.sql.in.c b/postgis/geography.sql.in.c
index 820080a112491c2589c068cc14ef19bbe42cb38e..dc38fc84adb5aac9ef44dd262fc8ff403a4751f0 100644 (file)
--- a/postgis/geography.sql.in.c
+++ b/postgis/geography.sql.in.c
@@ -775,12 +775,10 @@ CREATE OR REPLACE FUNCTION ST_Intersection(text, text)
 
 
 
-#ifdef GSERIALIZED_ON
 -----------------------------------------------------------------------------
 -- GiST ND GEOMETRY-over-GSERIALIZED
 -----------------------------------------------------------------------------
 
-
 -- ---------- ---------- ---------- ---------- ---------- ---------- ----------
 -- GiST Support Functions
 -- ---------- ---------- ---------- ---------- ---------- ---------- ----------
@@ -870,4 +868,3 @@ CREATE OPERATOR CLASS gist_geometry_ops_nd
        FUNCTION        6        geometry_gist_picksplit_nd (internal, internal),
        FUNCTION        7        geometry_gist_same_nd (geometry, geometry, internal);
 
-#endif

diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c
index 34b227143d948f29bc144a56c0e3d69b7bc7fb67..cf235441c998d321509088565a2b18db5c17a409 100644 (file)
--- a/postgis/legacy.sql.in.c
+++ b/postgis/legacy.sql.in.c
@@ -328,11 +328,7 @@ LANGUAGE 'plpgsql' VOLATILE;
 -- They should not be installed
 /** CREATE OR REPLACE FUNCTION st_geometry_analyze(internal)
        RETURNS bool
-#ifdef GSERIALIZED_ON
        AS 'MODULE_PATHNAME', 'geometry_analyze'
-#else
-       AS 'MODULE_PATHNAME', 'LWGEOM_analyze'
-#endif
        LANGUAGE 'C' VOLATILE STRICT;
        
 -- Deprecation in 1.5.0
@@ -408,101 +404,6 @@ CREATE OR REPLACE FUNCTION st_geometry_cmp(geometry, geometry)
        AS 'MODULE_PATHNAME', 'lwgeom_cmp'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
-#ifndef GSERIALIZED_ON
--------------------------------------------------------------------
--- GiST indexes
--------------------------------------------------------------------
-
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION postgis_gist_sel (internal, oid, internal, int4)
-       RETURNS float8
-       AS 'MODULE_PATHNAME', 'LWGEOM_gist_sel'
-       LANGUAGE 'C';
-
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION postgis_gist_joinsel(internal, oid, internal, smallint)
-       RETURNS float8
-       AS 'MODULE_PATHNAME', 'LWGEOM_gist_joinsel'
-       LANGUAGE 'C';
-       
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION st_postgis_gist_sel (internal, oid, internal, int4)
-       RETURNS float8
-       AS 'MODULE_PATHNAME', 'LWGEOM_gist_sel'
-       LANGUAGE 'C';
-
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION st_postgis_gist_joinsel(internal, oid, internal, smallint)
-       RETURNS float8
-       AS 'MODULE_PATHNAME', 'LWGEOM_gist_joinsel'
-       LANGUAGE 'C';
-
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION st_geometry_overleft(geometry, geometry)
-       RETURNS bool
-       AS 'MODULE_PATHNAME', 'LWGEOM_overleft'
-       LANGUAGE 'C' IMMUTABLE STRICT;
-
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION st_geometry_overright(geometry, geometry)
-       RETURNS bool
-       AS 'MODULE_PATHNAME', 'LWGEOM_overright'
-       LANGUAGE 'C' IMMUTABLE STRICT;
-
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION st_geometry_overabove(geometry, geometry)
-       RETURNS bool
-       AS 'MODULE_PATHNAME', 'LWGEOM_overabove'
-       LANGUAGE 'C' IMMUTABLE STRICT;
-
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION st_geometry_left(geometry, geometry)
-       RETURNS bool
-       AS 'MODULE_PATHNAME', 'LWGEOM_left'
-       LANGUAGE 'C' IMMUTABLE STRICT;
-
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION st_geometry_right(geometry, geometry)
-       RETURNS bool
-       AS 'MODULE_PATHNAME', 'LWGEOM_right'
-       LANGUAGE 'C' IMMUTABLE STRICT;
-
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION st_geometry_above(geometry, geometry)
-       RETURNS bool
-       AS 'MODULE_PATHNAME', 'LWGEOM_above'
-       LANGUAGE 'C' IMMUTABLE STRICT;
-
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION st_geometry_below(geometry, geometry)
-       RETURNS bool
-       AS 'MODULE_PATHNAME', 'LWGEOM_below'
-       LANGUAGE 'C' IMMUTABLE STRICT;
-
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION st_geometry_contain(geometry, geometry)
-       RETURNS bool
-       AS 'MODULE_PATHNAME', 'LWGEOM_contain'
-       LANGUAGE 'C' IMMUTABLE STRICT;
-
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION st_geometry_contained(geometry, geometry)
-       RETURNS bool
-       AS 'MODULE_PATHNAME', 'LWGEOM_contained'
-       LANGUAGE 'C' IMMUTABLE STRICT;
-
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION st_geometry_overlap(geometry, geometry)
-       RETURNS bool
-       AS 'MODULE_PATHNAME', 'LWGEOM_overlap'
-       LANGUAGE 'C' IMMUTABLE STRICT;
-
--- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION st_geometry_same(geometry, geometry)
-       RETURNS bool
-       AS 'MODULE_PATHNAME', 'LWGEOM_samebox'
-       LANGUAGE 'C' IMMUTABLE STRICT;
-#endif
 
 --- end functions that in theory should never have been used
 

diff --git a/postgis/legacy_compatibility_layer.sql.in.c b/postgis/legacy_compatibility_layer.sql.in.c
index acfa5bef85f49d80ba84dbac0f2c60b3fa1f712c..5ae23fb94906f0026f88a238a5b86ff966f61f01 100644 (file)
--- a/postgis/legacy_compatibility_layer.sql.in.c
+++ b/postgis/legacy_compatibility_layer.sql.in.c
@@ -21,20 +21,12 @@ CREATE OR REPLACE FUNCTION AsText(geometry)
 
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION Estimated_Extent(text,text,text) RETURNS box2d AS
-#ifdef GSERIALIZED_ON
        'MODULE_PATHNAME', 'geometry_estimated_extent'
-#else
-       'MODULE_PATHNAME', 'LWGEOM_estimated_extent'
-#endif
        LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;
        
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION Estimated_Extent(text,text) RETURNS box2d AS
-#ifdef GSERIALIZED_ON
        'MODULE_PATHNAME', 'geometry_estimated_extent'
-#else
-       'MODULE_PATHNAME', 'LWGEOM_estimated_extent'
-#endif
        LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;
        
 -- Deprecation in 1.2.3

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 7b1e22f31bf51498dbe2852d3c488c4846e1676f..40bdd4c581ca50719e47758eede70085680c7baa 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -61,7 +61,6 @@ CREATE OR REPLACE FUNCTION geometry_out(geometry)
        AS 'MODULE_PATHNAME','LWGEOM_out'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
-#ifdef GSERIALIZED_ON\r
 -- Availability: 2.0.0\r
 CREATE OR REPLACE FUNCTION geometry_typmod_in(cstring[])\r
        RETURNS integer\r
@@ -73,15 +72,10 @@ CREATE OR REPLACE FUNCTION geometry_typmod_out(integer)
        RETURNS cstring\r
        AS 'MODULE_PATHNAME','postgis_typmod_out'\r
        LANGUAGE 'C' IMMUTABLE STRICT; \r
-#endif\r
 \r
 CREATE OR REPLACE FUNCTION geometry_analyze(internal)\r
        RETURNS bool\r
-#ifdef GSERIALIZED_ON\r
        AS 'MODULE_PATHNAME', 'geometry_analyze_2d'\r
-#else\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_analyze'\r
-#endif\r
        LANGUAGE 'C' VOLATILE STRICT;\r
 \r
 CREATE OR REPLACE FUNCTION geometry_recv(internal)\r
@@ -100,12 +94,10 @@ CREATE TYPE geometry (
        output = geometry_out,\r
        send = geometry_send,\r
        receive = geometry_recv,\r
-#ifdef GSERIALIZED_ON\r
        typmod_in = geometry_typmod_in,\r
        typmod_out = geometry_typmod_out,\r
        delimiter = ':',\r
     alignment = double,\r
-#endif\r
        analyze = geometry_analyze,\r
        storage = main\r
 );\r
@@ -303,11 +295,7 @@ CREATE OR REPLACE FUNCTION box2d_out(box2d)
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
 CREATE TYPE box2d (\r
-#ifdef GSERIALIZED_ON\r
        internallength = 65,\r
-#else\r
-       internallength = 16,\r
-#endif\r
        input = box2d_in,\r
        output = box2d_out,\r
        storage = plain\r
@@ -348,11 +336,7 @@ CREATE OR REPLACE FUNCTION ST_Combine_BBox(box2d,geometry)
 -----------------------------------------------------------------------\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_estimated_extent(text,text,text) RETURNS box2d AS\r
-#ifdef GSERIALIZED_ON\r
        'MODULE_PATHNAME', 'geometry_estimated_extent'\r
-#else\r
-       'MODULE_PATHNAME', 'LWGEOM_estimated_extent'\r
-#endif\r
        LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;\r
 \r
 -----------------------------------------------------------------------\r
@@ -360,11 +344,7 @@ CREATE OR REPLACE FUNCTION ST_estimated_extent(text,text,text) RETURNS box2d AS
 -----------------------------------------------------------------------\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_estimated_extent(text,text) RETURNS box2d AS\r
-#ifdef GSERIALIZED_ON\r
        'MODULE_PATHNAME', 'geometry_estimated_extent'\r
-#else\r
-       'MODULE_PATHNAME', 'LWGEOM_estimated_extent'\r
-#endif\r
        LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;\r
 \r
 -----------------------------------------------------------------------\r
@@ -485,7 +465,6 @@ CREATE OPERATOR CLASS btree_geometry_ops
 \r
 \r
 \r
-#ifdef GSERIALIZED_ON\r
 -----------------------------------------------------------------------------\r
 -- GiST 2D GEOMETRY-over-GSERIALIZED\r
 -----------------------------------------------------------------------------\r
@@ -774,227 +753,7 @@ CREATE OPERATOR CLASS gist_geometry_ops_2d
        FUNCTION        5        geometry_gist_penalty_2d (internal, internal, internal),\r
        FUNCTION        6        geometry_gist_picksplit_2d (internal, internal),\r
        FUNCTION        7        geometry_gist_same_2d (geometry, geometry, internal);\r
-#else\r
-\r
--------------------------------------------------------------------\r
--- Original geometry GiST indexes\r
--------------------------------------------------------------------\r
--- Deprecation in 1.5.0 -- is this deprecated? 2011-01-05 robe\r
-CREATE OR REPLACE FUNCTION geometry_same(geometry, geometry)\r
-       RETURNS bool\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_samebox'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
-CREATE OR REPLACE FUNCTION geometry_gist_sel (internal, oid, internal, int4)\r
-       RETURNS float8\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_gist_sel'\r
-       LANGUAGE 'C';\r
-\r
-CREATE OR REPLACE FUNCTION geometry_gist_joinsel(internal, oid, internal, smallint)\r
-       RETURNS float8\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_gist_joinsel'\r
-       LANGUAGE 'C';\r
-\r
-CREATE OR REPLACE FUNCTION geometry_overleft(geometry, geometry)\r
-       RETURNS bool\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_overleft'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
-CREATE OR REPLACE FUNCTION geometry_overright(geometry, geometry)\r
-       RETURNS bool\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_overright'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
-CREATE OR REPLACE FUNCTION geometry_overabove(geometry, geometry)\r
-       RETURNS bool\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_overabove'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
-CREATE OR REPLACE FUNCTION geometry_overbelow(geometry, geometry)\r
-       RETURNS bool\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_overbelow'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
-CREATE OR REPLACE FUNCTION geometry_left(geometry, geometry)\r
-       RETURNS bool\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_left'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
-CREATE OR REPLACE FUNCTION geometry_right(geometry, geometry)\r
-       RETURNS bool\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_right'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
-CREATE OR REPLACE FUNCTION geometry_above(geometry, geometry)\r
-       RETURNS bool\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_above'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
-CREATE OR REPLACE FUNCTION geometry_below(geometry, geometry)\r
-       RETURNS bool\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_below'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
-CREATE OR REPLACE FUNCTION geometry_contain(geometry, geometry)\r
-       RETURNS bool\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_contain'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
-CREATE OR REPLACE FUNCTION geometry_contained(geometry, geometry)\r
-       RETURNS bool\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_contained'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
-CREATE OR REPLACE FUNCTION geometry_overlap(geometry, geometry)\r
-       RETURNS bool\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_overlap'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
-CREATE OR REPLACE FUNCTION geometry_samebox(geometry, geometry)\r
-       RETURNS bool\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_samebox'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
-CREATE OPERATOR << (\r
-       LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_left,\r
-       COMMUTATOR = '>>',\r
-       RESTRICT = positionsel, JOIN = positionjoinsel\r
-);\r
-\r
-CREATE OPERATOR &< (\r
-       LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overleft,\r
-       COMMUTATOR = '&>',\r
-       RESTRICT = positionsel, JOIN = positionjoinsel\r
-);\r
-\r
-CREATE OPERATOR <<| (\r
-       LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_below,\r
-       COMMUTATOR = '|>>',\r
-       RESTRICT = positionsel, JOIN = positionjoinsel\r
-);\r
-\r
-CREATE OPERATOR &<| (\r
-       LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overbelow,\r
-       COMMUTATOR = '|&>',\r
-       RESTRICT = positionsel, JOIN = positionjoinsel\r
-);\r
-\r
-CREATE OPERATOR && (\r
-       LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overlap,\r
-       COMMUTATOR = '&&',\r
-       RESTRICT = geometry_gist_sel, JOIN = geometry_gist_joinsel\r
-);\r
-\r
-CREATE OPERATOR &> (\r
-       LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overright,\r
-       COMMUTATOR = '&<',\r
-       RESTRICT = positionsel, JOIN = positionjoinsel\r
-);\r
-\r
-CREATE OPERATOR >> (\r
-       LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_right,\r
-       COMMUTATOR = '<<',\r
-       RESTRICT = positionsel, JOIN = positionjoinsel\r
-);\r
-\r
-CREATE OPERATOR |&> (\r
-       LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overabove,\r
-       COMMUTATOR = '&<|',\r
-       RESTRICT = positionsel, JOIN = positionjoinsel\r
-);\r
-\r
-CREATE OPERATOR |>> (\r
-       LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_above,\r
-       COMMUTATOR = '<<|',\r
-       RESTRICT = positionsel, JOIN = positionjoinsel\r
-);\r
-\r
-CREATE OPERATOR ~= (\r
-       LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_samebox,\r
-       COMMUTATOR = '~=',\r
-       RESTRICT = eqsel, JOIN = eqjoinsel\r
-);\r
-\r
-CREATE OPERATOR @ (\r
-       LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_contained,\r
-       COMMUTATOR = '~',\r
-       RESTRICT = contsel, JOIN = contjoinsel\r
-);\r
-\r
-CREATE OPERATOR ~ (\r
-       LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_contain,\r
-       COMMUTATOR = '@',\r
-       RESTRICT = contsel, JOIN = contjoinsel\r
-);\r
-\r
--- gist support functions\r
-\r
-CREATE OR REPLACE FUNCTION LWGEOM_gist_consistent(internal,geometry,int4)\r
-       RETURNS bool\r
-       AS 'MODULE_PATHNAME' ,'LWGEOM_gist_consistent'\r
-       LANGUAGE 'C';\r
-\r
-CREATE OR REPLACE FUNCTION LWGEOM_gist_compress(internal)\r
-       RETURNS internal\r
-       AS 'MODULE_PATHNAME','LWGEOM_gist_compress'\r
-       LANGUAGE 'C';\r
-\r
-CREATE OR REPLACE FUNCTION LWGEOM_gist_penalty(internal,internal,internal)\r
-       RETURNS internal\r
-       AS 'MODULE_PATHNAME' ,'LWGEOM_gist_penalty'\r
-       LANGUAGE 'C';\r
-\r
-CREATE OR REPLACE FUNCTION LWGEOM_gist_picksplit(internal, internal)\r
-       RETURNS internal\r
-       AS 'MODULE_PATHNAME' ,'LWGEOM_gist_picksplit'\r
-       LANGUAGE 'C';\r
-\r
-CREATE OR REPLACE FUNCTION LWGEOM_gist_union(bytea, internal)\r
-       RETURNS internal\r
-       AS 'MODULE_PATHNAME' ,'LWGEOM_gist_union'\r
-       LANGUAGE 'C';\r
 \r
-CREATE OR REPLACE FUNCTION LWGEOM_gist_same(box2d, box2d, internal)\r
-       RETURNS internal\r
-       AS 'MODULE_PATHNAME' ,'LWGEOM_gist_same'\r
-       LANGUAGE 'C';\r
-\r
-CREATE OR REPLACE FUNCTION LWGEOM_gist_decompress(internal)\r
-       RETURNS internal\r
-       AS 'MODULE_PATHNAME' ,'LWGEOM_gist_decompress'\r
-       LANGUAGE 'C';\r
-\r
--------------------------------------------\r
--- GIST opclass index binding entries.\r
--------------------------------------------\r
---\r
--- Create opclass index bindings for PG>=73\r
---\r
-\r
-CREATE OPERATOR CLASS gist_geometry_ops\r
-       DEFAULT FOR TYPE geometry USING gist AS\r
-       STORAGE         box2d,\r
-       OPERATOR        1        << ,\r
-       OPERATOR        2        &<     ,\r
-       OPERATOR        3        &&     ,\r
-       OPERATOR        4        &>     ,\r
-       OPERATOR        5        >>     ,\r
-       OPERATOR        6        ~=     ,\r
-       OPERATOR        7        ~      ,\r
-       OPERATOR        8        @      ,\r
-       OPERATOR        9        &<|    ,\r
-       OPERATOR        10       <<|    ,\r
-       OPERATOR        11       |>>    ,\r
-       OPERATOR        12       |&>    ,\r
-       FUNCTION        1        LWGEOM_gist_consistent (internal, geometry, int4),\r
-       FUNCTION        2        LWGEOM_gist_union (bytea, internal),\r
-       FUNCTION        3        LWGEOM_gist_compress (internal),\r
-       FUNCTION        4        LWGEOM_gist_decompress (internal),\r
-       FUNCTION        5        LWGEOM_gist_penalty (internal, internal, internal),\r
-       FUNCTION        6        LWGEOM_gist_picksplit (internal, internal),\r
-       FUNCTION        7        LWGEOM_gist_same (box2d, box2d, internal);\r
-\r
-#endif\r
 \r
 -------------------------------------------\r
 -- other lwgeom functions\r
@@ -4423,9 +4182,6 @@ CREATE OR REPLACE FUNCTION ST_distance_sphere(geometry,geometry)
        COST 300;\r
 \r
 \r
-\r
-\r
-#ifdef GSERIALIZED_ON\r
 ---------------------------------------------------------------\r
 -- GEOMETRY_COLUMNS view support functions\r
 ---------------------------------------------------------------\r
@@ -4585,7 +4341,6 @@ CREATE OR REPLACE VIEW geometry_columns AS
     AND a.attrelid = c.oid \r
     AND c.relnamespace = n.oid \r
     AND (c.relkind = 'r'::"char" OR c.relkind = 'v'::"char") AND NOT pg_is_other_temp_schema(c.relnamespace);\r
-#endif\r
 \r
 \r
 \r

diff --git a/postgis/sqldefines.h.in b/postgis/sqldefines.h.in
index 90a33c5a0e41df65c47fe435728dd1d41bb8731e..5b765e87feda449e6690fa1b006e8a605c9412d1 100644 (file)
--- a/postgis/sqldefines.h.in
+++ b/postgis/sqldefines.h.in
@@ -21,5 +21,4 @@
 
 #endif /* _LWPGIS_DEFINES */
 
-#include "gserialized.h"
 

diff --git a/raster/rt_pg/rt_pg.h b/raster/rt_pg/rt_pg.h
index c9e4655d05f60a2d1fa710087e85ca772a3b19b1..b350448954da42e22d01bc16165c26fcfc75daca 100644 (file)
--- a/raster/rt_pg/rt_pg.h
+++ b/raster/rt_pg/rt_pg.h
@@ -34,7 +34,6 @@
 #include "rt_api.h"
 #include "../../postgis_config.h"
 #include "../raster_config.h"
-#include "gserialized.h"
 
 /* Debugging macros */
 #if POSTGIS_DEBUG_LEVEL > 0

diff --git a/raster/rt_pg/rtpostgis.sql.in.c b/raster/rt_pg/rtpostgis.sql.in.c
index c1372ab6396021b4cfc750ea754d33086612bb8b..d0d1380c3918dd63893c6ebe1096552f13a8bed6 100644 (file)
--- a/raster/rt_pg/rtpostgis.sql.in.c
+++ b/raster/rt_pg/rtpostgis.sql.in.c
@@ -22,8 +22,6 @@
 --
 -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-#include "../../libpgcommon/gserialized.h"
-
 -- BEGIN;
 
 ------------------------------------------------------------------------------
@@ -2470,11 +2468,7 @@ CREATE OPERATOR &<| (
 CREATE OPERATOR && (
     LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_overlap,
     COMMUTATOR = '&&',
-#ifdef GSERIALIZED_ON
     RESTRICT = contsel, JOIN = contjoinsel
-#else
-    RESTRICT = geometry_gist_sel, JOIN = geometry_gist_joinsel
-#endif
     );
 
 CREATE OPERATOR &> (