Skip to content

Commit 9fca6cf

Browse files
mark987gitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 380a4d9 commit 9fca6cf

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,7 @@ ifeq ($(uname_O),Cygwin)
10861086
NO_SYMLINK_HEAD = YesPlease
10871087
NO_IPV6 = YesPlease
10881088
OLD_ICONV = UnfortunatelyYes
1089-
V15_MINGW_HEADERS = YesPlease
1089+
CYGWIN_V15_WIN32API = YesPlease
10901090
endif
10911091
NO_THREAD_SAFE_PREAD = YesPlease
10921092
NEEDS_LIBICONV = YesPlease
@@ -1894,8 +1894,8 @@ ifdef NO_REGEX
18941894
COMPAT_CFLAGS += -Icompat/regex
18951895
COMPAT_OBJS += compat/regex/regex.o
18961896
endif
1897-
ifdef V15_MINGW_HEADERS
1898-
COMPAT_CFLAGS += -DV15_MINGW_HEADERS
1897+
ifdef CYGWIN_V15_WIN32API
1898+
COMPAT_CFLAGS += -DCYGWIN_V15_WIN32API
18991899
endif
19001900

19011901
ifdef USE_NED_ALLOCATOR

compat/cygwin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define WIN32_LEAN_AND_MEAN
2-
#ifdef V15_MINGW_HEADERS
2+
#ifdef CYGWIN_V15_WIN32API
33
#include "../git-compat-util.h"
44
#include "win32.h"
55
#else

0 commit comments

Comments
 (0)