[geos-commits] r2956 - branches/3.2/source/headers/geos

[svn_geos at osgeo.org]

Author: mloskot
Date: 2010-03-26 08:35:58 -0400 (Fri, 26 Mar 2010)
New Revision: 2956

Modified:
   branches/3.2/source/headers/geos/platform.h.vc
Log:
platform.h.vc: disable min/max macros substitution (ported from trunk)

Modified: branches/3.2/source/headers/geos/platform.h.vc
===================================================================
--- branches/3.2/source/headers/geos/platform.h.vc	2010-03-26 12:35:10 UTC (rev 2955)
+++ branches/3.2/source/headers/geos/platform.h.vc	2010-03-26 12:35:58 UTC (rev 2956)
@@ -26,6 +26,10 @@
 #define WIN32
 #endif
 
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
 #include <float.h>
 
 // We need M_PI, but on MSVC you need to define _USE_MATH_DEFINES before
@@ -47,7 +51,7 @@
 #define DoubleInfinity std::numeric_limits<double>::infinity()
 #define DoubleNegInfinity -std::numeric_limits<double>::infinity()
 
-#define DoubleMax std::numeric_limits<double>::max()
+#define DoubleMax (std::numeric_limits<double>::max)()
 
 #define FINITE(x) _finite(static_cast<double>(x))
 #define finite(x) _finite(static_cast<double>(x))