[geos-commits] r3815 - in branches/3.3: . include/geos

[svn_geos at osgeo.org]

Author: strk
Date: 2013-06-11 05:36:24 -0700 (Tue, 11 Jun 2013)
New Revision: 3815

Modified:
   branches/3.3/NEWS
   branches/3.3/include/geos/profiler.h
Log:
Fix for mingw64 compile, by Regina Obe (#630)

Modified: branches/3.3/NEWS
===================================================================
--- branches/3.3/NEWS	2013-06-07 09:29:05 UTC (rev 3814)
+++ branches/3.3/NEWS	2013-06-11 12:36:24 UTC (rev 3815)
@@ -7,6 +7,7 @@
     - Fix RobustLineIntersector handling of invalid intersection points (#622)
     - Reduce likelyhood of invalid output from snap operation (#629, #501)
     - Reduce memory fragmentation of prepared Polygon/Point intersection op
+    - Fix mingw64 compile (#630)
 
 Changes in 3.3.8
 2013-02-28

Modified: branches/3.3/include/geos/profiler.h
===================================================================
--- branches/3.3/include/geos/profiler.h	2013-06-07 09:29:05 UTC (rev 3814)
+++ branches/3.3/include/geos/profiler.h	2013-06-11 12:36:24 UTC (rev 3815)
@@ -16,10 +16,12 @@
 #ifndef GEOS_PROFILER_H
 #define GEOS_PROFILER_H
 
+#include <stdlib.h> /** need this to correctly detect MINGW64 **/
 #include <geos/export.h>
 
 /* For MingW builds with __STRICT_ANSI__ (-ansi) */
-#if defined(__MINGW32__)
+/** MINGW64 doesn't have a config.h **/
+#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
 /* Allow us to check for presence of gettimeofday in MingW */ 
 #include <config.h>
 
@@ -32,7 +34,7 @@
 }
 #endif
  
-#if defined(_MSC_VER) || defined(__MINGW32__) && !defined(HAVE_GETTIMEOFDAY)
+#if defined(_MSC_VER) || defined(__MINGW32__) && !defined(HAVE_GETTIMEOFDAY) && !defined(__MINGW64_VERSION_MAJOR)
 #include <geos/timeval.h>
 #else
 #include <sys/time.h>