From 2f2034629eeef2ff351fc085b81926c23379244b Mon Sep 17 00:00:00 2001 From: Connor Manning Date: Wed, 11 Mar 2015 09:01:49 -0500 Subject: [PATCH] Constrain MSVC _isfinite to before 2013, remove duplicate includes. --- src/lib_json/json_writer.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp index de13f1b..f7ad1e2 100644 --- a/src/lib_json/json_writer.cpp +++ b/src/lib_json/json_writer.cpp @@ -16,10 +16,9 @@ #include #include -#if defined(_MSC_VER) && _MSC_VER >= 1200 // VC++ 6.0 and above +#if defined(_MSC_VER) && _MSC_VER >= 1200 && _MSC_VER < 1800 // Between VC++ 6.0 and VC++ 11.0 #include #define isfinite _finite -#define snprintf _snprintf #elif defined(__sun) && defined(__SVR4) //Solaris #include #define isfinite finite @@ -29,7 +28,6 @@ #endif #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below -#include #define snprintf _snprintf #endif