kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2012-11-20 10:44:29 -08:00
parent 9cfe5f4be3 9fca6cffc0
commit 2f2c7e1252
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1086,6 +1086,7 @@ ifeq ($(uname_O),Cygwin)
NO_SYMLINK_HEAD = YesPlease NO_SYMLINK_HEAD = YesPlease
NO_IPV6 = YesPlease NO_IPV6 = YesPlease
OLD_ICONV = UnfortunatelyYes OLD_ICONV = UnfortunatelyYes
CYGWIN_V15_WIN32API = YesPlease
endif endif
NO_THREAD_SAFE_PREAD = YesPlease NO_THREAD_SAFE_PREAD = YesPlease
NEEDS_LIBICONV = YesPlease NEEDS_LIBICONV = YesPlease
@ -1897,6 +1898,9 @@ ifdef NO_REGEX
COMPAT_CFLAGS += -Icompat/regex COMPAT_CFLAGS += -Icompat/regex
COMPAT_OBJS += compat/regex/regex.o COMPAT_OBJS += compat/regex/regex.o
endif endif
ifdef CYGWIN_V15_WIN32API
COMPAT_CFLAGS += -DCYGWIN_V15_WIN32API
endif


ifdef USE_NED_ALLOCATOR ifdef USE_NED_ALLOCATOR
COMPAT_CFLAGS += -Icompat/nedmalloc COMPAT_CFLAGS += -Icompat/nedmalloc

7
compat/cygwin.c
View File

@ -1,6 +1,13 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#ifdef CYGWIN_V15_WIN32API
#include "../git-compat-util.h" #include "../git-compat-util.h"
#include "win32.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 */ #include "../cache.h" /* to read configuration */


static inline void filetime_to_timespec(const FILETIME *ft, struct timespec *ts) static inline void filetime_to_timespec(const FILETIME *ft, struct timespec *ts)