[geos-commits] r2141 - trunk/source/headers/geos

[svn_geos at osgeo.org]

Author: mloskot
Date: 2008-07-26 16:47:29 -0400 (Sat, 26 Jul 2008)
New Revision: 2141

Modified:
   trunk/source/headers/geos/version.h.in
   trunk/source/headers/geos/version.h.vc
Log:
Guarded version macros with #ifndef conditions to avoid redefinition errors (Ticket #167).

Modified: trunk/source/headers/geos/version.h.in
===================================================================
--- trunk/source/headers/geos/version.h.in	2008-07-26 20:24:29 UTC (rev 2140)
+++ trunk/source/headers/geos/version.h.in	2008-07-26 20:47:29 UTC (rev 2141)
@@ -1,10 +1,38 @@
-#ifndef _GEOS_VERSION_H
-#define _GEOS_VERSION_H
+/**********************************************************************
+ * $Id$
+ *
+ * GEOS - Geometry Engine Open Source
+ * http://geos.refractions.net
+ *
+ * Copyright (C) 2007 Refractions Research Inc.
+ *
+ * This is free software; you can redistribute and/or modify it under
+ * the terms of the GNU Lesser General Public Licence as published
+ * by the Free Software Foundation. 
+ * See the COPYING file for more information.
+ *
+ **********************************************************************/
+#ifndef GEOS_VERSION_H_INCLUDED
+#define GEOS_VERSION_H_INCLUDED
 
+#ifndef GEOS_VERSION_MAJOR
 #define GEOS_VERSION_MAJOR @VERSION_MAJOR@
+#endif
+
+#ifndef GEOS_VERSION_MINOR
 #define GEOS_VERSION_MINOR @VERSION_MINOR@
+#endif
+
+#ifndef GEOS_VERSION_PATCH
 #define GEOS_VERSION_PATCH @VERSION_PATCH@
+#endif
+
+#ifndef GEOS_VERSION
 #define GEOS_VERSION "@VERSION@"
+#endif
+
+#ifndef GEOS_JTS_PORT
 #define GEOS_JTS_PORT "@JTS_PORT@"
+#endif
 
-#endif // _GEOS_VERSION_H
+#endif // GEOS_VERSION_H_INCLUDED

Modified: trunk/source/headers/geos/version.h.vc
===================================================================
--- trunk/source/headers/geos/version.h.vc	2008-07-26 20:24:29 UTC (rev 2140)
+++ trunk/source/headers/geos/version.h.vc	2008-07-26 20:47:29 UTC (rev 2141)
@@ -19,18 +19,31 @@
  * number changes.
  *
  **********************************************************************/
+#ifndef GEOS_VERSION_H_INCLUDED
+#define GEOS_VERSION_H_INCLUDED
 
-#ifndef GEOS_VERSION_H
-#define GEOS_VERSION_H
-
 #ifndef _MSC_VER
 #error "This version.h intended for use with MS Visual C++"
 #endif
 
+#ifndef GEOS_VERSION_MAJOR
 #define GEOS_VERSION_MAJOR 3
+#endif
+
+#ifndef GEOS_VERSION_MINOR
 #define GEOS_VERSION_MINOR 1
+#endif
+
+#ifndef GEOS_VERSION_PATCH
 #define GEOS_VERSION_PATCH 0
+#endif
+
+#ifndef GEOS_VERSION
 #define GEOS_VERSION "3.1.0"
+#endif
+
+#ifndef GEOS_JTS_PORT
 #define GEOS_JTS_PORT "1.7.1"
+#endif
 
-#endif // GEOS_VERSION_H
+#endif // GEOS_VERSION_H_INCLUDED