[postgis-commits] svn - r3093 - trunk/lwgeom

[postgis-commits at postgis.refractions.net]

Author: mcayland
Date: 2008-10-13 04:36:17 -0700 (Mon, 13 Oct 2008)
New Revision: 3093

Modified:
   trunk/lwgeom/lwgeom_functions_basic.c
   trunk/lwgeom/lwgeom_geos_prepared.c
   trunk/lwgeom/lwgeom_geos_prepared.h
Log:
Fix up some more warnings in SVN trunk; note that there are still 2 remaining PreparedGeometry warnings, but these will require patching GEOS.


Modified: trunk/lwgeom/lwgeom_functions_basic.c
===================================================================
--- trunk/lwgeom/lwgeom_functions_basic.c	2008-10-12 17:55:38 UTC (rev 3092)
+++ trunk/lwgeom/lwgeom_functions_basic.c	2008-10-13 11:36:17 UTC (rev 3093)
@@ -1912,7 +1912,7 @@
 		POSTGIS_DEBUGF(3, " %d bytes allocated for array", (int)nbytes);
 
 		POSTGIS_DEBUGF(3, " array start  @ %p", (void*)result);
-		POSTGIS_DEBUGF(3, " ARR_DATA_PTR @ %p (%d)",
+		POSTGIS_DEBUGF(3, " ARR_DATA_PTR @ %p (%ld)",
 			ARR_DATA_PTR(result), (uchar *)ARR_DATA_PTR(result)-(uchar *)result);
 		POSTGIS_DEBUGF(3, " next element @ %p", (uchar *)result+oldsize);
 

Modified: trunk/lwgeom/lwgeom_geos_prepared.c
===================================================================
--- trunk/lwgeom/lwgeom_geos_prepared.c	2008-10-12 17:55:38 UTC (rev 3092)
+++ trunk/lwgeom/lwgeom_geos_prepared.c	2008-10-13 11:36:17 UTC (rev 3093)
@@ -69,7 +69,7 @@
 {
 	MemoryContext context;
 	const GEOSPreparedGeometry* prepared_geom;
-	const GEOSGeometry* geom;
+	GEOSGeometry* geom;
 } PrepGeomHashEntry;
 
 /* Memory context hash table function prototypes */

Modified: trunk/lwgeom/lwgeom_geos_prepared.h
===================================================================
--- trunk/lwgeom/lwgeom_geos_prepared.h	2008-10-12 17:55:38 UTC (rev 3092)
+++ trunk/lwgeom/lwgeom_geos_prepared.h	2008-10-13 11:36:17 UTC (rev 3093)
@@ -51,7 +51,7 @@
 	size_t                        pg_geom2_size;
 	int32                         argnum;
 	const GEOSPreparedGeometry*   prepared_geom;
-	const GEOSGeometry*           geom;
+	GEOSGeometry*                 geom;
 	MemoryContext                 context;
 } PrepGeomCache;