diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-29 14:15:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-29 14:15:54 -0700 |
| commit | 3bb56a91be7d136f5f03902ea900185e01a2cdcb (patch) | |
| tree | cc0974859ee762ed3c99594acb5c6ec94ebcd34e /compat/mingw.h | |
| parent | 625efa9decb64e2b51c4bef342922553729cf2f6 (diff) | |
| parent | 0ef60afdd4416345b16b5c4d8d0558a08d680bc5 (diff) | |
| download | git-3bb56a91be7d136f5f03902ea900185e01a2cdcb.tar.gz git-3bb56a91be7d136f5f03902ea900185e01a2cdcb.tar.xz | |
Merge branch 'ss/msvc' into maint
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/mingw.h')
| -rw-r--r-- | compat/mingw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index c00869463..1de70ffd6 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -406,7 +406,7 @@ static inline void convert_slashes(char *path) int mingw_offset_1st_component(const char *path); #define offset_1st_component mingw_offset_1st_component #define PATH_SEP ';' -#ifndef __MINGW64_VERSION_MAJOR +#if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800) #define PRIuMAX "I64u" #define PRId64 "I64d" #else |