Merge pull request #1 from drwalton/master

Disable definition of snprintf on VS2015
tbennun · Jan 30, 2017 · a19b5e0 · a19b5e0
2 parents 7553b41 + aba5fde
commit a19b5e0
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/windows/port.cc b/src/windows/port.cc
@@ -55,10 +55,17 @@ int safe_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
   return _vsnprintf(str, size-1, format, ap);
 }
 
+//Only define snprintf for VS 2013 and earlier, as VS 2015 now
+// includes a definition of snprintf.
+// See: https://msdn.microsoft.com/en-us/library/2ts7cx93.aspx
+#if defined(_MSC_VER) && _MSC_VER < 1900
+
 int snprintf(char *str, size_t size, const char *format, ...) {
   va_list ap;
   va_start(ap, format);
   const int r = vsnprintf(str, size, format, ap);
   va_end(ap);
   return r;
 }
+
+#endif