[GRASS-SVN] r38879 - in grass/branches/develbranch_6: include lib/vector/Vlib

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-08-27 02:41:04 -0400 (Thu, 27 Aug 2009)
New Revision: 38879

Modified:
   grass/branches/develbranch_6/include/Vect.h
   grass/branches/develbranch_6/lib/vector/Vlib/geos.c
Log:
glynn: Fixes to work with GEOS 2.x 
       (merge from trunk, r38878)


Modified: grass/branches/develbranch_6/include/Vect.h
===================================================================
--- grass/branches/develbranch_6/include/Vect.h	2009-08-26 20:18:08 UTC (rev 38878)
+++ grass/branches/develbranch_6/include/Vect.h	2009-08-27 06:41:04 UTC (rev 38879)
@@ -5,7 +5,11 @@
 
 #ifdef HAVE_GEOS
 #include <geos_c.h>
+#if GEOS_VERSION_MAJOR < 3
+typedef struct GEOSGeom_t GEOSGeometry;
+typedef struct GEOSCoordSeq_t GEOSCoordSequence;
 #endif
+#endif
 
 /* --- ANSI prototypes for the lib/vector/Vlib functions --- */
 

Modified: grass/branches/develbranch_6/lib/vector/Vlib/geos.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/Vlib/geos.c	2009-08-26 20:18:08 UTC (rev 38878)
+++ grass/branches/develbranch_6/lib/vector/Vlib/geos.c	2009-08-27 06:41:04 UTC (rev 38879)
@@ -19,7 +19,6 @@
 #include <grass/glocale.h>
 
 #ifdef HAVE_GEOS
-#include <geos_c.h>
 
 static GEOSGeometry *Vect__read_line_geos(struct Map_info *, long, int *);
 static GEOSCoordSequence *V1_read_line_geos(struct Map_info *, long, int *);