| diff -aur OUTa/libglog/glog-0.3.4/src/windows/port.cc OUT/libglog/glog-0.3.4/src/windows/port.cc |
| --- OUTa/libglog/glog-0.3.4/src/windows/port.cc 2015-03-10 21:02:27.000000000 -0700 |
| +++ OUT/libglog/glog-0.3.4/src/windows/port.cc 2016-02-04 06:39:15.020941800 -0800 |
| @@ -36,6 +36,7 @@ |
| # error You should only be including windows/port.cc in a windows environment! |
| #endif |
| |
| +#if !defined(_MSC_VER) || _MSC_VER < 1900 |
| #include "config.h" |
| #include <stdarg.h> // for va_list, va_start, va_end |
| #include <string.h> // for strstr() |
| @@ -62,3 +63,4 @@ |
| va_end(ap); |
| return r; |
| } |
| +#endif |
| \ No newline at end of file |
| diff -aur OUTa/libglog/glog-0.3.4/src/windows/port.h OUT/libglog/glog-0.3.4/src/windows/port.h |
| --- OUTa/libglog/glog-0.3.4/src/windows/port.h 2015-03-10 21:02:27.000000000 -0700 |
| +++ OUT/libglog/glog-0.3.4/src/windows/port.h 2016-02-04 06:46:29.038741800 -0800 |
| @@ -107,6 +107,7 @@ |
| /* Sleep is in ms, on windows */ |
| #define sleep(secs) Sleep((secs) * 1000) |
| |
| +#if _MSC_VER < 1900 |
| /* We can't just use _vsnprintf and _snprintf as drop-in-replacements, |
| * because they don't always NUL-terminate. :-( We also can't use the |
| * name vsnprintf, since windows defines that (but not snprintf (!)). |
| @@ -117,6 +118,7 @@ |
| 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 // _MSC_VER < 1900 |
| |
| /* Windows doesn't support specifying the number of buckets as a |
| * hash_map constructor arg, so we leave this blank. |
