[geos-commits] r2608 - trunk/source/headers/geos
svn_geos at osgeo.org
svn_geos at osgeo.org
Sat Jul 4 12:19:44 EDT 2009
Author: strk
Date: 2009-07-04 12:19:43 -0400 (Sat, 04 Jul 2009)
New Revision: 2608
Modified:
trunk/source/headers/geos/export.h
trunk/source/headers/geos/platform.h.in
Log:
Apply fix-mingw.patch by Sanak (issue #273)
Modified: trunk/source/headers/geos/export.h
===================================================================
--- trunk/source/headers/geos/export.h 2009-06-29 16:40:44 UTC (rev 2607)
+++ trunk/source/headers/geos/export.h 2009-07-04 16:19:43 UTC (rev 2608)
@@ -17,12 +17,12 @@
#define GEOS_EXPORT_H
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)
- # if defined( GEOS_DLL_LIBRARY_STATIC )
- # define GEOS_DLL
- # elif defined( GEOS_DLL_LIBRARY )
+ # if defined( GEOS_DLL_EXPORT )
# define GEOS_DLL __declspec(dllexport)
+ # elif defined( GEOS_DLL_IMPORT )
+ # define GEOS_DLL __declspec(dllimport)
# else
- # define GEOS_DLL __declspec(dllimport)
+ # define GEOS_DLL
# endif
#else
# define GEOS_DLL
Modified: trunk/source/headers/geos/platform.h.in
===================================================================
--- trunk/source/headers/geos/platform.h.in 2009-06-29 16:40:44 UTC (rev 2607)
+++ trunk/source/headers/geos/platform.h.in 2009-07-04 16:19:43 UTC (rev 2608)
@@ -59,7 +59,7 @@
inline bool
isFinite(double d)
{
-#if defined(HAVE_FINITE) && !defined(HAVE_ISFINITE)
+#if defined(HAVE_FINITE) && !defined(HAVE_ISFINITE) && !defined(__MINGW32__)
return (finite(d));
#else
// Put using namespace std; here if you have to
More information about the geos-commits
mailing list