diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-11 20:30:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 20:30:20 (GMT) |
| commit | e936318aa61760a8fe02557bd3c241136613fb34 (patch) | |
| tree | 0c6eba82cb2eecd1a462e702e93aa89b55370462 /git-compat-util.h | |
| parent | a62d73e7c6fff96ea7fb2133b3e127a4a4bda957 (diff) | |
| parent | 83ff1da3e81824eebf0425ad9200248ea7205c35 (diff) | |
| download | git-e936318aa61760a8fe02557bd3c241136613fb34.zip git-e936318aa61760a8fe02557bd3c241136613fb34.tar.gz git-e936318aa61760a8fe02557bd3c241136613fb34.tar.bz2 | |
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 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index aa0404e..ff193f4 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -85,13 +85,14 @@ #define _NETBSD_SOURCE 1 #define _SGI_SOURCE 1 -#ifdef WIN32 /* Both MinGW and MSVC */ +#if defined(WIN32) && !defined(__CYGWIN__) /* Both MinGW and MSVC */ # if defined (_MSC_VER) # define _WIN32_WINNT 0x0502 # endif #define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */ #include <winsock2.h> #include <windows.h> +#define GIT_WINDOWS_NATIVE #endif #include <unistd.h> |