The GEOS 2.2 series "geos_c.h" is missing header guards, so including the header...

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

diff --git a/lwgeom/lwgeom_geos.h b/lwgeom/lwgeom_geos.h
index 1f4dc98f6705a2900eb68dfb9583af8b728502da..93b980d8c17131b563fc3d5776e8fc5c567be700 100644 (file)
--- a/lwgeom/lwgeom_geos.h
+++ b/lwgeom/lwgeom_geos.h
@@ -23,7 +23,12 @@
 #include "utils/memutils.h"
 #include "executor/spi.h"
 
+/* Workaround for GEOS 2.2 compatibility: old geos_c.h does not contain 
+   header guards to protect from multiple inclusion */ 
+#ifndef GEOS_C_INCLUDED
+#define GEOS_C_INCLUDED
 #include "geos_c.h"
+#endif
 
 #include "lwgeom_pg.h"
 #include "liblwgeom.h"

diff --git a/lwgeom/lwgeom_geos_prepared.h b/lwgeom/lwgeom_geos_prepared.h
index 46701eae2d4fc4319b84905cb70b33db565884a2..9651c7bbc55b37641bd7575e0e3b3378017ab047 100644 (file)
--- a/lwgeom/lwgeom_geos_prepared.h
+++ b/lwgeom/lwgeom_geos_prepared.h
@@ -19,7 +19,12 @@
 #include "utils/memutils.h"
 #include "access/hash.h"
 
+/* Workaround for GEOS 2.2 compatibility: old geos_c.h does not contain
+   header guards to protect from multiple inclusion */
+#ifndef GEOS_C_INCLUDED
+#define GEOS_C_INCLUDED
 #include "geos_c.h"
+#endif
 
 #include "lwgeom_pg.h"
 #include "liblwgeom.h"