Make compilable with VS2015

So Microsoft decided to make their C runtime conform to C99
dos1 · Mar 6, 2015 · 30a362f · 30a362f
1 parent c12d424
commit 30a362f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/base/compat.h b/base/compat.h
@@ -2,7 +2,7 @@
 
 // Implement C99 functions and similar that are missing in MSVC.
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
 
 int c99_snprintf(char* str, size_t size, const char* format, ...);
 #define snprintf c99_snprintf

diff --git a/ext/libzip/zipint.h b/ext/libzip/zipint.h
@@ -40,7 +40,9 @@
 #define ZIP_EXTERN
 #define fseeko fseek
 #define ftello ftell
+#if _MSC_VER < 1900 
 #define snprintf _snprintf
+#endif
 #ifndef strcasecmp
 #define strcasecmp _stricmp
 #endif

diff --git a/net/url.h b/net/url.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #undef snprintf
 #define snprintf _snprintf
 #endif