Merge pull request #2116 from lioncash/snprintf

msvc: Conditionally enable the snprintf macro
2015-09-15 04:08:27 +02:00 · 2015-09-15 04:08:27 +02:00 · cdc18f5ae6
parent da907ab54f fc64f6d82a
commit cdc18f5ae6
1 changed files with 4 additions and 3 deletions
--- a/libretro-common/include/compat/msvc.h
+++ b/libretro-common/include/compat/msvc.h
@ -23,14 +23,15 @@
 #ifndef __LIBRETRO_SDK_COMPAT_MSVC_H
 #define __LIBRETRO_SDK_COMPAT_MSVC_H

-#ifdef _WIN32
+#ifdef _MSC_VER
+
+// Pre-MSVC 2015 compilers don't implement snprintf in a cross-platform manner.
+#if _MSC_VER < 1900
 #ifndef snprintf
 #define snprintf _snprintf
 #endif
 #endif

-#ifdef _MSC_VER
-
 #undef UNICODE /* Do not bother with UNICODE at this time. */
 #include <direct.h>
 #include <stddef.h>