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/vcbuild/include | |
parent | Merge branch 'oa/doc-diff-check' (diff) | |
parent | MSVC: use shipped headers instead of fallback definitions (diff) | |
download | tgif-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/vcbuild/include')
-rw-r--r-- | compat/vcbuild/include/unistd.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compat/vcbuild/include/unistd.h b/compat/vcbuild/include/unistd.h index c65c2cd566..3a959d124c 100644 --- a/compat/vcbuild/include/unistd.h +++ b/compat/vcbuild/include/unistd.h @@ -45,11 +45,15 @@ typedef unsigned long long uintmax_t; typedef int64_t off64_t; +#if !defined(_MSC_VER) || _MSC_VER < 1600 #define INTMAX_MIN _I64_MIN #define INTMAX_MAX _I64_MAX #define UINTMAX_MAX _UI64_MAX #define UINT32_MAX 0xffffffff /* 4294967295U */ +#else +#include <stdint.h> +#endif #define STDIN_FILENO 0 #define STDOUT_FILENO 1 |