diff options
| author | Andreas Schuh <andreas.schuh.84@gmail.com> | 2015-05-20 00:37:42 +0100 |
|---|---|---|
| committer | Andreas Schuh <andreas.schuh.84@gmail.com> | 2015-05-20 00:37:42 +0100 |
| commit | f0523f14a93cbb46fff9b318508aa1c6923158c7 (patch) | |
| tree | f84bd0d4154445e49f531e49bd39c7510ad24f12 /src | |
| parent | 58345b18d92892a170d61a76c5dd2d290413bdd7 (diff) | |
| parent | 4a56d614cfd21d33c7d65ebc3c4ed0eb3cda0807 (diff) | |
| download | gflags-f0523f14a93cbb46fff9b318508aa1c6923158c7.tar.gz | |
Merge pull request #116 from KjellSchubert/vs2015
Fix build with MS VS 2015 RC
Diffstat (limited to 'src')
| -rw-r--r-- | src/windows_port.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/windows_port.cc b/src/windows_port.cc index 1f40458..9ccb630 100644 --- a/src/windows_port.cc +++ b/src/windows_port.cc @@ -59,6 +59,8 @@ int safe_vsnprintf(char *str, size_t size, const char *format, va_list ap) { # pragma warning(pop) #endif +#if _MSC_VER < 1900 // msvs 2015 finally includes snprintf + int snprintf(char *str, size_t size, const char *format, ...) { int r; va_list ap; @@ -68,4 +70,6 @@ int snprintf(char *str, size_t size, const char *format, ...) { return r; } +#endif + #endif /* #if !defined(__MINGW32__) && !defined(__MINGW64__) */ |