Skip to content

Commit

Permalink
USE CGYWIN_V15_WIN32API as macro to select api for cygwin
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Levedahl authored and Junio C Hamano committed Nov 19, 2012
1 parent 380a4d9 commit 9fca6cf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,7 @@ ifeq ($(uname_O),Cygwin)
NO_SYMLINK_HEAD = YesPlease
NO_IPV6 = YesPlease
OLD_ICONV = UnfortunatelyYes
V15_MINGW_HEADERS = YesPlease
CYGWIN_V15_WIN32API = YesPlease
endif
NO_THREAD_SAFE_PREAD = YesPlease
NEEDS_LIBICONV = YesPlease
Expand Down Expand Up @@ -1894,8 +1894,8 @@ ifdef NO_REGEX
COMPAT_CFLAGS += -Icompat/regex
COMPAT_OBJS += compat/regex/regex.o
endif
ifdef V15_MINGW_HEADERS
COMPAT_CFLAGS += -DV15_MINGW_HEADERS
ifdef CYGWIN_V15_WIN32API
COMPAT_CFLAGS += -DCYGWIN_V15_WIN32API
endif

ifdef USE_NED_ALLOCATOR
Expand Down
2 changes: 1 addition & 1 deletion compat/cygwin.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define WIN32_LEAN_AND_MEAN
#ifdef V15_MINGW_HEADERS
#ifdef CYGWIN_V15_WIN32API
#include "../git-compat-util.h"
#include "win32.h"
#else
Expand Down

0 comments on commit 9fca6cf

Please sign in to comment.