From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Sat, 4 Oct 2008 17:49:51 +0000 (+0000)
Subject: Protect prepared geometry implementation in GEOS>=3.1 defines.
X-Git-Tag: 1.4.0b1~656
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1eb2c316cf733731c497447bbd9c5cd740851e06;p=postgis

Protect prepared geometry implementation in GEOS>=3.1 defines.


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

diff --git a/lwgeom/lwgeom_geos_c.c b/lwgeom/lwgeom_geos_c.c
index 2e79dd626..b0aa06187 100644
--- a/lwgeom/lwgeom_geos_c.c
+++ b/lwgeom/lwgeom_geos_c.c
@@ -3559,6 +3559,7 @@ Datum intersectsPrepared(PG_FUNCTION_ARGS);
 ** PreparedGeometry have to be cached, because the PreparedGeometry
 ** contains a reference to the geometry.
 */
+#ifdef PREPARED_GEOM
 typedef struct
 {
 	int32					key1;
@@ -3793,7 +3794,6 @@ DeletePrepGeomHashEntry(MemoryContext mcxt)
 ** cycling keys don't cause too much preparing.
 **
 */
-#ifdef PREPARED_GEOM
 PrepGeomCache* 
 GetPrepGeomCache(FunctionCallInfoData *fcinfo, PG_LWGEOM *serialized_geom1, PG_LWGEOM *serialized_geom2, int32 key1, int32 key2)
 {