[geos-commits] r4076 - trunk/src

[svn_geos at osgeo.org]

Author: robe
Date: 2015-08-11 17:22:26 -0700 (Tue, 11 Aug 2015)
New Revision: 4076

Modified:
   trunk/src/inlines.cpp
Log:
#736 3.5.0-dev compilation errors on MinGW - okay committed too fast.  This one works but may screw up real mingw people

Modified: trunk/src/inlines.cpp
===================================================================
--- trunk/src/inlines.cpp	2015-08-11 23:27:29 UTC (rev 4075)
+++ trunk/src/inlines.cpp	2015-08-12 00:22:26 UTC (rev 4076)
@@ -28,7 +28,7 @@
 // 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(_MSC_VER) && !defined(__MINGW64_VERSION_MAJOR) && (!defined(__MINGW32__) || defined(__MINGW32__) && !defined(GEOS_DLL_EXPORT))
+#if !defined(_MSC_VER) && (!defined(__MINGW32__) || defined(__MINGW32__) && !defined(GEOS_DLL_EXPORT) && !defined(DLL_EXPORT) )
 
 // If using cygwin then we suppress the "multiple definition" errors by
 // ignoring this section completely; the cygwin linker seems to handle
@@ -60,6 +60,7 @@
 #include <geos/noding/MCIndexNoder.inl>
 
 #endif // defined __CYGWIN__
+
 #endif // defined __MINGW32__ and !defined GEOS_DLL_EXPORT
 
 #endif // defined GEOS_INLINE