[geos-commits] r2221 - trunk/source

[svn_geos at osgeo.org]

Author: pramsey
Date: 2008-11-17 22:09:56 -0500 (Mon, 17 Nov 2008)
New Revision: 2221

Modified:
   trunk/source/inlines.cpp
Log:
Cygwin build fix from MCA


Modified: trunk/source/inlines.cpp
===================================================================
--- trunk/source/inlines.cpp	2008-11-11 17:32:38 UTC (rev 2220)
+++ trunk/source/inlines.cpp	2008-11-18 03:09:56 UTC (rev 2221)
@@ -23,13 +23,18 @@
 // Otherwise we'll end up with duplicated symbols
 #ifdef GEOS_INLINE
 
-// If using MingW or Cygwin with GEOS_INLINE to build a DLL then Win32 gcc
+// If using MingW with GEOS_INLINE to build a DLL then MingW's 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(__GNUC__) && defined(_WIN32)) || defined(__GNUC__) && defined(_WIN32) && !defined(DLL_EXPORT)
+#if ! defined(__MINGW32__) || defined(__MINGW32__) && !defined(DLL_EXPORT) 
 
+// If using cygwin then we suppress the "multiple definition" errors by
+// ignoring this section completely; the cygwin linker seems to handle
+// the stubs correctly at link time by itself
+#if ! defined(__CYGWIN__)
 
+
 // Undefine GEOS_INLINE so that .inl files
 // will be ready for an implementation file
 #undef GEOS_INLINE 
@@ -57,7 +62,7 @@
 #include <geos/noding/snapround/MCIndexSnapRounder.inl>
 #include <geos/noding/MCIndexNoder.inl>
 
-
+#endif // defined __CYGWIN__
 #endif // defined __MINGW32__ and !defined DLL_EXPORT
 
 #endif // defined GEOS_INLINE