From aff60520bddecbc7426816696d99f994d5d24bff Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 20 Feb 2016 11:31:58 +0500 Subject: Fix some warnings in GLog/GFlags when buildingwith MSVC2013 Those warnings were only addressed for MSVC2015 so far. --- extern/gflags/src/windows_port.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'extern') diff --git a/extern/gflags/src/windows_port.h b/extern/gflags/src/windows_port.h index 8b870ecb138..1f546996783 100644 --- a/extern/gflags/src/windows_port.h +++ b/extern/gflags/src/windows_port.h @@ -69,8 +69,10 @@ extern GFLAGS_DLL_DECL int snprintf(char *str, size_t size, 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) +#if defined(_MSC_VER) && (_MSC_VER < 1400) #define va_copy(dst, src) (dst) = (src) #endif +#endif #endif /* #if !defined(__MINGW32__) && !defined(__MINGW64__) */ #ifdef _MSC_VER @@ -109,7 +111,7 @@ inline void setenv(const char* name, const char* value, int) { #define unlink _unlink #endif -#if !(defined(_MSC_VER) && _MSC_VER >= 1900) +#if !(defined(_MSC_VER) && _MSC_VER >= 1400) #define PRId32 "d" #define PRIu32 "u" #define PRId64 "I64d" -- cgit v1.2.3