[geos-commits] r3816 - in trunk: . include/geos

[svn_geos at osgeo.org]

Author: strk
Date: 2013-06-11 05:42:27 -0700 (Tue, 11 Jun 2013)
New Revision: 3816

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

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2013-06-11 12:36:24 UTC (rev 3815)
+++ trunk/NEWS	2013-06-11 12:42:27 UTC (rev 3816)
@@ -1,6 +1,85 @@
 Changes in 3.4.0
 ????-??-??
 
+Changes in 3.3.8
+2013-02-28
+
+- Bug fixes / improvements
+    - IsValidOp: throw proper error on nested shells (#608)
+    - Fix header guards (#617, #618, #619)
+    - WKTWriter::appendCoordinate optimisation
+    - Fix centroid computation for collections with empty components (#582)
+
+Changes in 3.3.7
+2013-01-22 
+
+- Bug fixes / improvements
+    - Fix abort in RightmostEdgeFinder (#605)
+    - Do not force precision reduction below 6 significant digits
+      while trying to obtain a valid Buffer output (#605)
+    - Fix GEOSPointOnSurface with zero-length linestring (#609)
+    - Fix EMPTY return from zero-area polygon (#613)
+    - Segfault from symdifference (#615)
+
+Changes in 3.3.6
+2012-11-15 -- that's Post-GIS day !
+
+- Bug fixes / improvements
+    - Add support for testing with phpunit 3.6 (not loosing support for 3.4)
+    - Segfault from intersection (#586, #598, #599)
+
+Changes in 3.3.5
+2012-06-25
+
+- Bug fixes / improvements
+    - Correctly increment CAPI lib version from 3.3.3 (#558)
+    - Port robustness fix to CentroidArea (#559)
+    - Always return POINT from GEOSGetCentroid, even for EMPTY (#560)
+    - Always return POINT from GEOSPointOnSurface, even for EMPTY (#561)
+
+Changes in 3.3.4
+2012-05-31
+
+- Bug fixes / improvements
+    - Do not abort on NaN overlay input (#530)
+    - Reduce CommonBitsRemover harmful effects during overlay op (#527)
+    - Better cross-compiler support (#534)
+    - Enable overlay ops short-circuits (#542)
+    - Envelope-based short-circuit for symDifference (#543)
+    - Fix support for PHP 5.4 (#513)
+    - Fix TopologyPreservingSimplifier invalid output on closed line (#508)
+    - Reduce calls to ptNotInList, greatly speeding up Polygonizer (#545)
+
+Changes in 3.3.3
+2012-04-01
+
+- Bug fixes / improvements
+    - Fix simplification of collections with empty items (#519)
+    - Fix MSVC compilation of ambiguous log() call (#506)
+    - Fix CMake issues with std:: namespace detection (#493)
+
+Changes in 3.3.2
+2012-01-05
+
+- Bug fixes / improvements
+    - Fix CMAKE_CXX_FLAGS overriding -std=gnu++0x (#489)
+    - Missing versions update in CMake configuration (#490)
+    - Fix noding of self-intersecting lines through UnaryUnion (#482)
+    - Fix handling of collapsed edges skipping in BufferOp (#494)
+    - Print up to 18 digits of precision for TopologyException points
+    - Fix noding with reduced precision in Buffer operation (#473)
+    - Fix HotPixel original point invalidation (#498)
+    - Fix CascadedPolygonUnion to discard non-polygonal components (#499)
+    - Improve buffer robustness by reverting to non-snaprounding noder (#495)
+    - Fix C++11 build by avoiding std::pair<auto_ptr> (#491)
+    - Add --clibs to geos-config and GEOS_C_LIBS to geos.m4 (#497)
+    - Apply shoelace formula for area calculation (#485)
+    - Fix default initialization issue for clang (#500)
+    - Improve overlay robustness by fixing areal validity on snapping (#488)
+
+Changes in 3.3.1
+2011-09-27
+
 - New things:
   - Delaunay Triangulation API (#487, #565, #570)
   - Interruptibility API (C and C++)

Modified: trunk/include/geos/profiler.h
===================================================================
--- trunk/include/geos/profiler.h	2013-06-11 12:36:24 UTC (rev 3815)
+++ trunk/include/geos/profiler.h	2013-06-11 12:42:27 UTC (rev 3816)
@@ -15,10 +15,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>
 
@@ -31,7 +33,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>