diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-21 19:17:34 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-22 18:10:08 +0300 |
commit | 161393805f606089959f04b7656bd33b9b91311f (patch) | |
tree | 945863eb60b5a4702204cd065d4bf0fcf489b392 /extern/gflags/src/windows_port.h | |
parent | cfe43f8d1af2183a115414abd56a899d116be27d (diff) |
Update Google libraries
This commit updates:
- gflags 2.2.0 -> 2.2.1
- glog 0.3.4 -> 0.3.4
- gmock 1.7.0 -> 1.8.0
- gtest 1.7.0 -> 1.8.0
Diffstat (limited to 'extern/gflags/src/windows_port.h')
-rw-r--r-- | extern/gflags/src/windows_port.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extern/gflags/src/windows_port.h b/extern/gflags/src/windows_port.h index 1f546996783..61cf5b7e3a1 100644 --- a/extern/gflags/src/windows_port.h +++ b/extern/gflags/src/windows_port.h @@ -69,10 +69,8 @@ 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 @@ -111,7 +109,9 @@ inline void setenv(const char* name, const char* value, int) { #define unlink _unlink #endif -#if !(defined(_MSC_VER) && _MSC_VER >= 1400) +#if defined(_MSC_VER) && _MSC_VER >= 1800 +#include <inttypes.h> +#else #define PRId32 "d" #define PRIu32 "u" #define PRId64 "I64d" |