Re: [PATCH 2/2 V3] MSVC: Use shipped headers instead of fallback definitions
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:09:07
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 2/2 V3] MSVC: Use shipped headers instead of fallback definitions · Sven Strickroth <hidden>
- 2016-06-15 · Re: [PATCH 2/2 V3] MSVC: Use shipped headers instead of fallback definitions · Sebastian Schuberth <hidden>
- 2016-06-15 · Re: [PATCH 2/2 V3] MSVC: Use shipped headers instead of fallback definitions · Johannes Schindelin <hidden>
Sven Strickroth [off-list ref] writes:
quoted hunk
diff --git a/compat/mingw.h b/compat/mingw.h index 6b6d695..137f42e 100644 --- a/compat/mingw.h +++ b/compat/mingw.h@@ -415,7 +415,7 @@ int mingw_offset_1st_component(const char *path); extern void build_libgit_environment(void); extern const char *program_data_config(void); #define git_program_data_config program_data_config -#ifndef __MINGW64_VERSION_MAJOR +#if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800) #define PRIuMAX "I64u" #define PRId64 "I64d" #else
I'll wiggle this in, but you seem to be building on top of some unrelated work (please avoid sending such a patch in the future). Thanks, all of you. -- >8 -- From: Sven Strickroth <redacted> Date: Wed, 30 Mar 2016 13:37:36 +0200 Subject: [PATCH] MSVC: use shipped headers instead of fallback definitions VS2010 comes with stdint.h [1] VS2013 comes with inttypes.h [2] [1] https://stackoverflow.com/a/2628014/3906760 [2] https://blogs.msdn.microsoft.com/vcblog/2013/07/19/c99-library-support-in-visual-studio-2013/ Signed-off-by: Sven Strickroth <redacted> Acked-by: Johannes Schindelin <redacted> Acked-by: Sebastian Schuberth <redacted> Signed-off-by: Junio C Hamano <redacted> --- compat/mingw.h | 2 +- compat/vcbuild/include/unistd.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/compat/mingw.h b/compat/mingw.h
index c008694..1de70ff 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
diff --git a/compat/vcbuild/include/unistd.h b/compat/vcbuild/include/unistd.h
index c65c2cd..3a959d1 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
--
2.8.0-215-gd29a7d9