USE CGYWIN_V15_WIN32API as macro to select api for cygwin
The previous macro was confusing to some, and did not include "cygwin" in its name. The updated name more clearly expresses a choice of the win32api implementation that shipped with version 1.5 of cygwin. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mark Levedahl committed
Nov 18, 2012 at 16:16 UTC
9fca6cffc05321445b59c91e8f8d308f41588b53
2 files changed
+4
-4
Makefile
+3
-3
@@ -1086,7 +1086,7 @@ ifeq ($(uname_O),Cygwin)
1086
NO_SYMLINK_HEAD = YesPlease
1087
NO_IPV6 = YesPlease
1088
OLD_ICONV = UnfortunatelyYes
1089
- V15_MINGW_HEADERS = YesPlease
1089
+ CYGWIN_V15_WIN32API = YesPlease
1090
endif
1091
NO_THREAD_SAFE_PREAD = YesPlease
1092
NEEDS_LIBICONV = YesPlease
@@ -1894,8 +1894,8 @@ ifdef NO_REGEX
1894
COMPAT_CFLAGS += -Icompat/regex
1895
COMPAT_OBJS += compat/regex/regex.o
1896
endif
1897
-ifdef V15_MINGW_HEADERS
1898
- COMPAT_CFLAGS += -DV15_MINGW_HEADERS
1897
+ifdef CYGWIN_V15_WIN32API
1898
+ COMPAT_CFLAGS += -DCYGWIN_V15_WIN32API
1899
endif
1900
1901
ifdef USE_NED_ALLOCATOR
compat/cygwin.c
+1
-1
@@ -1,5 +1,5 @@
1
#define WIN32_LEAN_AND_MEAN
2
-#ifdef V15_MINGW_HEADERS
2
+#ifdef CYGWIN_V15_WIN32API
3
#include "../git-compat-util.h"
4
#include "win32.h"
5
#else