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/win32.h | |
parent | a62d73e7c6fff96ea7fb2133b3e127a4a4bda957 (diff) | |
parent | 83ff1da3e81824eebf0425ad9200248ea7205c35 (diff) | |
download | git-e936318aa61760a8fe02557bd3c241136613fb34.tar.gz git-e936318aa61760a8fe02557bd3c241136613fb34.tar.xz |
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/win32.h')
-rw-r--r-- | compat/win32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/win32.h b/compat/win32.h index 8ce91048d..a97e88075 100644 --- a/compat/win32.h +++ b/compat/win32.h @@ -2,7 +2,7 @@ #define WIN32_H /* common Win32 functions for MinGW and Cygwin */ -#ifndef WIN32 /* Not defined by Cygwin */ +#ifndef GIT_WINDOWS_NATIVE /* Not defined for Cygwin */ #include <windows.h> #endif |