diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:30:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:30:20 -0700 |
| commit | e936318aa61760a8fe02557bd3c241136613fb34 (patch) | |
| tree | 0c6eba82cb2eecd1a462e702e93aa89b55370462 /compat/cygwin.c | |
| parent | a62d73e7c6fff96ea7fb2133b3e127a4a4bda957 (diff) | |
| parent | 83ff1da3e81824eebf0425ad9200248ea7205c35 (diff) | |
| download | git-e936318aa61760a8fe02557bd3c241136613fb34.tar.gz | |
Merge branch 'rj/mingw-cygwin'
Update build for Cygwin 1.[57]. Torsten Bögershausen reports that
this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it
ahead.
* rj/mingw-cygwin:
cygwin: Remove the CYGWIN_V15_WIN32API build variable
mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
Diffstat (limited to 'compat/cygwin.c')
| -rw-r--r-- | compat/cygwin.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/compat/cygwin.c b/compat/cygwin.c index 871b41d23a..91ce5d4c7a 100644 --- a/compat/cygwin.c +++ b/compat/cygwin.c @@ -1,14 +1,9 @@ #define CYGWIN_C #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 */ /* |