[geos-commits] r2787 - trunk/source/headers/geos

[svn_geos at osgeo.org]

Author: mloskot
Date: 2009-12-03 14:59:06 -0500 (Thu, 03 Dec 2009)
New Revision: 2787

Modified:
   trunk/source/headers/geos/platform.h.vc
   trunk/source/headers/geos/timeval.h
Log:
Part 26 of larger changeset - source/headers:
* Refine FINITE macro - pseudo-POSIX layer in Visual C++ does not offer long double version of finite()
* Tidy up.

Modified: trunk/source/headers/geos/platform.h.vc
===================================================================
--- trunk/source/headers/geos/platform.h.vc	2009-12-03 19:57:24 UTC (rev 2786)
+++ trunk/source/headers/geos/platform.h.vc	2009-12-03 19:59:06 UTC (rev 2787)
@@ -49,8 +49,8 @@
 
 #define DoubleMax std::numeric_limits<double>::max()
 
-#define FINITE(x) _finite(x)
-#define finite(x) _finite(x)
+#define FINITE(x) _finite(static_cast<double>(x))
+#define finite(x) _finite(static_cast<double>(x))
 
 typedef __int64 int64;
 

Modified: trunk/source/headers/geos/timeval.h
===================================================================
--- trunk/source/headers/geos/timeval.h	2009-12-03 19:57:24 UTC (rev 2786)
+++ trunk/source/headers/geos/timeval.h	2009-12-03 19:59:06 UTC (rev 2787)
@@ -13,10 +13,9 @@
  *
  **********************************************************************/
 
+#ifndef GEOS_TIMEVAL_H
+#define GEOS_TIMEVAL_H
 
-#ifndef _TIMEVAL_H
-#define _TIMEVAL_H
-
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
@@ -120,4 +119,4 @@
 
 #endif /* _WIN32_WCE */
 
-#endif /* _TIMEVAL_H */
+#endif /* GEOS_TIMEVAL_H */