[PATCH 06/12] Add _MSC_VER in porting head file git-compat-util.h
flat view
DORMANTno replies
From: Frank Li <hidden>
Date: 2016-06-15 22:47:17
Subsystem:
the rest · Maintainer:
Linus Torvalds
Add Microsoft C++ compiler predefine _MSC_VER at git-compat-util.h to include msvc.h at MSVC environment Signed-off-by: Frank Li <redacted> --- git-compat-util.h | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/git-compat-util.h b/git-compat-util.h
index 9f941e4..cb89294 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h@@ -77,8 +77,10 @@ #include <string.h> #include <errno.h> #include <limits.h> +#ifndef _MSC_VER #include <sys/param.h> #include <sys/types.h> +#endif #include <dirent.h> #include <sys/time.h> #include <time.h>
@@ -86,7 +88,12 @@ #include <fnmatch.h> #include <assert.h> #include <regex.h> + +#ifndef _MSC_VER #include <utime.h> +#endif + +#ifndef _MSC_VER #ifndef __MINGW32__ #include <sys/wait.h> #include <sys/poll.h>
@@ -114,7 +121,10 @@ #else /* __MINGW32__ */ /* pull in Windows compatibility stuff */ #include "compat/mingw.h" -#endif /* __MINGW32__ */ +#endif /* __MINGW32__ */ +#else /* _MSC_VER */ +#include "compat/msvc.h" +#endif /* _MSC_VER */ #ifndef NO_LIBGEN_H #include <libgen.h>
--
1.6.4.msysgit.0