diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 09:31:58 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 12:06:05 +0300 |
| commit | aff60520bddecbc7426816696d99f994d5d24bff (patch) | |
| tree | 96fab2339230114821f505e441f7159037efbb86 /extern/gflags | |
| parent | ff675f03672cb359f35398d45bcdea4aa62292fa (diff) | |
Fix some warnings in GLog/GFlags when buildingwith MSVC2013
Those warnings were only addressed for MSVC2015 so far.
Diffstat (limited to 'extern/gflags')
| -rw-r--r-- | extern/gflags/src/windows_port.h | 4 |
1 files changed, 3 insertions, 1 deletions
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" |