Index: mapprimitive.h
===================================================================
RCS file: /data2/cvsroot/mapserver/mapprimitive.h,v
retrieving revision 1.20
diff -U3 -r1.20 mapprimitive.h
--- mapprimitive.h	27 Jun 2006 06:53:08 -0000	1.20
+++ mapprimitive.h	31 Aug 2006 10:20:19 -0000
@@ -97,7 +97,7 @@
   lineObj *line;
   char **values;
 
-#ifdef USE_GEOS
+#ifndef SWIG
   void *geometry;
 #endif
 
Index: mapprimitive.c
===================================================================
RCS file: /data2/cvsroot/mapserver/mapprimitive.c,v
retrieving revision 1.75
diff -U3 -r1.75 mapprimitive.c
--- mapprimitive.c	17 Aug 2006 04:32:16 -0000	1.75
+++ mapprimitive.c	31 Aug 2006 10:20:21 -0000
@@ -203,9 +203,7 @@
   shape->values = NULL;
   shape->numvalues = 0;
 
-#ifdef USE_GEOS
   shape->geometry = NULL;
-#endif
 
   /* annotation component */
   shape->text = NULL;
@@ -243,9 +241,7 @@
     to->numvalues = from->numvalues;
   }
 
-#ifdef USE_GEOS
   to->geometry = NULL; /* GEOS code will build automatically if necessary */
-#endif
 
   return(0);
 }