diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-20 10:44:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-20 10:44:29 -0800 |
| commit | 2f2c7e12524e337dff7dae9df7b431c81f150136 (patch) | |
| tree | 2e76a15c717f05cefe9e7a5075f7e02bf545ca0a | |
| parent | Merge branch 'jk/checkout-out-of-unborn' (diff) | |
| parent | USE CGYWIN_V15_WIN32API as macro to select api for cygwin (diff) | |
| download | git-2f2c7e12524e337dff7dae9df7b431c81f150136.tar.gz git-2f2c7e12524e337dff7dae9df7b431c81f150136.zip | |
Merge branch 'ml/cygwin-mingw-headers'
Make git compile on cygwin with newer header files.
* ml/cygwin-mingw-headers:
USE CGYWIN_V15_WIN32API as macro to select api for cygwin
Update cygwin.c for new mingw-64 win32 api headers
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | compat/cygwin.c | 7 |
2 files changed, 11 insertions, 0 deletions
@@ -1086,6 +1086,7 @@ ifeq ($(uname_O),Cygwin) NO_SYMLINK_HEAD = YesPlease NO_IPV6 = YesPlease OLD_ICONV = UnfortunatelyYes + CYGWIN_V15_WIN32API = YesPlease endif NO_THREAD_SAFE_PREAD = YesPlease NEEDS_LIBICONV = YesPlease @@ -1897,6 +1898,9 @@ ifdef NO_REGEX COMPAT_CFLAGS += -Icompat/regex COMPAT_OBJS += compat/regex/regex.o endif +ifdef CYGWIN_V15_WIN32API + COMPAT_CFLAGS += -DCYGWIN_V15_WIN32API +endif ifdef USE_NED_ALLOCATOR COMPAT_CFLAGS += -Icompat/nedmalloc diff --git a/compat/cygwin.c b/compat/cygwin.c index dfe9b3084f..5428858875 100644 --- a/compat/cygwin.c +++ b/compat/cygwin.c @@ -1,6 +1,13 @@ #define WIN32_LEAN_AND_MEAN +#ifdef CYGWIN_V15_WIN32API #include "../git-compat-util.h" #include "win32.h" +#else +#include <sys/stat.h> +#include <sys/errno.h> +#include "win32.h" +#include "../git-compat-util.h" +#endif #include "../cache.h" /* to read configuration */ static inline void filetime_to_timespec(const FILETIME *ft, struct timespec *ts) |