diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-08 14:29:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-08 14:29:13 -0700 |
| commit | 4af4612466ad26e2da8e03558487dd38b2ee68ba (patch) | |
| tree | 31edc9805807e1f44f6ad9a2e7781dd48b7c3e4c /compat/snprintf.c | |
| parent | b0fbcf0003d87c050a55434eaf74a48ad78cb2a9 (diff) | |
| parent | 0ef60afdd4416345b16b5c4d8d0558a08d680bc5 (diff) | |
| download | git-4af4612466ad26e2da8e03558487dd38b2ee68ba.tar.gz git-4af4612466ad26e2da8e03558487dd38b2ee68ba.tar.xz | |
Merge branch 'ss/msvc'
Build updates for MSVC.
* ss/msvc:
MSVC: use shipped headers instead of fallback definitions
MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
Diffstat (limited to 'compat/snprintf.c')
| -rw-r--r-- | compat/snprintf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/snprintf.c b/compat/snprintf.c index 42ea1ac11..0b1168853 100644 --- a/compat/snprintf.c +++ b/compat/snprintf.c @@ -9,7 +9,7 @@ * always have room for a trailing NUL byte. */ #ifndef SNPRINTF_SIZE_CORR -#if defined(WIN32) && (!defined(__GNUC__) || __GNUC__ < 4) +#if defined(WIN32) && (!defined(__GNUC__) || __GNUC__ < 4) && (!defined(_MSC_VER) || _MSC_VER < 1900) #define SNPRINTF_SIZE_CORR 1 #else #define SNPRINTF_SIZE_CORR 0 |