diff options
Diffstat (limited to 'extern/libmv/third_party/gflags/windows_port.cc')
| -rw-r--r-- | extern/libmv/third_party/gflags/windows_port.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/extern/libmv/third_party/gflags/windows_port.cc b/extern/libmv/third_party/gflags/windows_port.cc index b1a0f1929a1..b5b7194c9a4 100644 --- a/extern/libmv/third_party/gflags/windows_port.cc +++ b/extern/libmv/third_party/gflags/windows_port.cc @@ -43,7 +43,8 @@ #include "windows_port.h" // These call the windows _vsnprintf, but always NUL-terminate. -#if !defined(__MINGW32__) && !defined(__MINGW64__) && !(defined(_MSC_VER) && _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 */ #ifdef _MSC_VER # pragma warning(push) @@ -68,4 +69,5 @@ int snprintf(char *str, size_t size, const char *format, ...) { return r; } -#endif /* #if !defined(__MINGW32__) && !defined(__MINGW64__) && !(defined(_MSC_VER) && _MSC_VER >= 1900) */ +#endif /* if !(defined(_MSC_VER) && _MSC_VER >= 1900) */ +#endif /* #if !defined(__MINGW32__) && !defined(__MINGW64__) */ |