fix gdal compile with msvs 2013 - closes #2257

include/mapnik/global.hpp

@@ -154,7 +154,7 @@ inline void read_double_xdr(const char* data, double & val)
 #endif
 }
 
-#ifdef _WINDOWS
+#if defined(_MSC_VER) && _MSC_VER < 1800
 // msvc doesn't have rint in <cmath>
 inline int rint(double val)
 {
@@ -165,7 +165,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

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,