From 3e1ab9beabf4496e8a32869af33cb883267395ff Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Mon, 25 Aug 2014 17:50:45 -0700
Subject: [PATCH] fix gdal compile with msvs 2013 - closes #2257

---
 include/mapnik/global.hpp              | 4 +++-
 plugins/input/gdal/gdal_featureset.cpp | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/mapnik/global.hpp b/include/mapnik/global.hpp
index 0265ef03b..d1dcf0774 100644
--- a/include/mapnik/global.hpp
+++ b/include/mapnik/global.hpp
@@ -112,7 +112,7 @@ inline void read_double_xdr(const char* data, double & val)
     std::memcpy(&val,&bits,8);
 }
 
-#ifdef _WINDOWS
+#if defined(_MSC_VER) && _MSC_VER < 1800
 // msvc doesn't have rint in <cmath>
 inline int rint(double val)
 {
@@ -123,7 +123,9 @@ inline double round(double val)
 {
     return std::floor(val);
 }
+#endif
 
+#if defined(_MSC_VER)
 #define  _USE_MATH_DEFINES
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
diff --git a/plugins/input/gdal/gdal_featureset.cpp b/plugins/input/gdal/gdal_featureset.cpp
index 4ae613297..7df8ebd04 100644
--- a/plugins/input/gdal/gdal_featureset.cpp
+++ b/plugins/input/gdal/gdal_featureset.cpp
@@ -48,10 +48,6 @@ using mapnik::geometry_type;
 using mapnik::datasource_exception;
 using mapnik::feature_factory;
 
-#ifdef _WINDOWS
-using mapnik::rint;
-#endif
-
 gdal_featureset::gdal_featureset(GDALDataset& dataset,
                                  int band,
                                  gdal_query q,