Merge branch 'vs2015'

2016-06-11 12:14:12 -04:00
parent 857f5fcced 416abd81a1
commit f12924458f
4 changed files with 8 additions and 1 deletions
@@ -44,7 +44,7 @@
 #if !defined WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
-#if !defined snprintf
+#if !defined snprintf && defined _MSC_VER && _MSC_VER < 1900
 #define snprintf _snprintf
 #endif
 #if !defined stat