[geos-commits] r2217 - trunk/source

[svn_geos at osgeo.org]

Author: pramsey
Date: 2008-10-28 11:47:16 -0400 (Tue, 28 Oct 2008)
New Revision: 2217

Modified:
   trunk/source/inlines.cpp
Log:
Cygwin/Mingw patch from Mark Cave-Ayland



Modified: trunk/source/inlines.cpp
===================================================================
--- trunk/source/inlines.cpp	2008-10-28 15:44:20 UTC (rev 2216)
+++ trunk/source/inlines.cpp	2008-10-28 15:47:16 UTC (rev 2217)
@@ -23,11 +23,11 @@
 // Otherwise we'll end up with duplicated symbols
 #ifdef GEOS_INLINE
 
-// If using MingW with GEOS_INLINE to build a DLL then MingW's gcc
+// If using MingW or Cygwin with GEOS_INLINE to build a DLL then Win32 gcc
 // has already generated the stubs for the contents of this file. 
 // Hence we need to supress it to avoid "multiple definition" errors
 // during the final link phase
-#if ! defined(__MINGW32__) || defined(__MINGW32__) && !defined(DLL_EXPORT)
+#if !(defined(__GNUC__) && defined(_WIN32)) || defined(__GNUC__) && defined(_WIN32) && !defined(DLL_EXPORT)
 
 
 // Undefine GEOS_INLINE so that .inl files