diff options
Diffstat (limited to 'extern/libmv/third_party/gflags/windows_port.h')
| -rw-r--r-- | extern/libmv/third_party/gflags/windows_port.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/extern/libmv/third_party/gflags/windows_port.h b/extern/libmv/third_party/gflags/windows_port.h index 3ccd4f28d85..8b870ecb138 100644 --- a/extern/libmv/third_party/gflags/windows_port.h +++ b/extern/libmv/third_party/gflags/windows_port.h @@ -62,13 +62,15 @@ * because they don't always NUL-terminate. :-( We also can't use the * name vsnprintf, since windows defines that (but not snprintf (!)). */ -#if !defined(__MINGW32__) && !defined(__MINGW64__) && !(_MSC_VER >= 1900) /* mingw already defines */ +#if !defined(__MINGW32__) && !defined(__MINGW64__) /* mingw already defines */ +#if !(defined(_MSC_VER) && _MSC_VER >= 1900) /* msvc 2015 already defines */ extern GFLAGS_DLL_DECL int snprintf(char *str, size_t size, const char *format, ...); extern int GFLAGS_DLL_DECL safe_vsnprintf(char *str, size_t size, const char *format, va_list ap); #define vsnprintf(str, size, format, ap) safe_vsnprintf(str, size, format, ap) #define va_copy(dst, src) (dst) = (src) +#endif #endif /* #if !defined(__MINGW32__) && !defined(__MINGW64__) */ #ifdef _MSC_VER @@ -107,7 +109,7 @@ inline void setenv(const char* name, const char* value, int) { #define unlink _unlink #endif -#if !(_MSC_VER >= 1900) +#if !(defined(_MSC_VER) && _MSC_VER >= 1900) #define PRId32 "d" #define PRIu32 "u" #define PRId64 "I64d" |