mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USE CGYWIN_V15_WIN32API as macro to select api for cygwin

Browse Source 
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>
This commit is contained in:
Mark Levedahl 2012-11-18 16:16:52 -05:00 committed by Junio C Hamano
parent 380a4d927b
commit 9fca6cffc0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1086,7 +1086,7 @@ ifeq ($(uname_O),Cygwin)
NO_SYMLINK_HEAD = YesPlease NO_SYMLINK_HEAD = YesPlease
NO_IPV6 = YesPlease NO_IPV6 = YesPlease
OLD_ICONV = UnfortunatelyYes OLD_ICONV = UnfortunatelyYes
V15_MINGW_HEADERS = YesPlease CYGWIN_V15_WIN32API = YesPlease
endif endif
NO_THREAD_SAFE_PREAD = YesPlease NO_THREAD_SAFE_PREAD = YesPlease
NEEDS_LIBICONV = YesPlease NEEDS_LIBICONV = YesPlease
@ -1894,8 +1894,8 @@ ifdef NO_REGEX
COMPAT_CFLAGS += -Icompat/regex COMPAT_CFLAGS += -Icompat/regex
COMPAT_OBJS += compat/regex/regex.o COMPAT_OBJS += compat/regex/regex.o
endif endif
ifdef V15_MINGW_HEADERS ifdef CYGWIN_V15_WIN32API
COMPAT_CFLAGS += -DV15_MINGW_HEADERS COMPAT_CFLAGS += -DCYGWIN_V15_WIN32API
endif endif
ifdef USE_NED_ALLOCATOR ifdef USE_NED_ALLOCATOR

2
compat/cygwin.c
View File

@ -1,5 +1,5 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#ifdef V15_MINGW_HEADERS #ifdef CYGWIN_V15_WIN32API
#include "../git-compat-util.h" #include "../git-compat-util.h"
#include "win32.h" #include "win32.h"
#else #else