[PATCH] Rename V15_MINGW_HEADERS into CYGWIN_OLD_WINSOCK_HEADERS
- From
Torsten Bögershausen <tboegi@web.de>
- Date
- Nov 17, 2012, 07:09 UTC
- Message-ID
- <201211170809.50395.tboegi@web.de>
See commit 380a4d927bff693c42fc6b22c3547bdcaac4bdc3: "Update cygwin.c for new mingw-64 win32 api headers" Cygwin up to 1.7.16 uses some header file from the WINE project Cygwin 1.7.17 uses some header file from the mingw-64 project As the old cygwin (like 1.5) never used mingw, the name V15_MINGW_HEADERS is confusing. Rename it into CYGWIN_OLD_WINSOCK_HEADERS
Addtional note: Cygwin versions 1.7.1 up to 1.7.16 are expected to upgrade to Cygwin 1.7.17 or higher As a temporary workaround make can be run as CYGWIN_OLD_WINSOCK_HEADERS=Yes make
Signed-off-by: Torsten Bögershausen <tboegi@web.de> --- Makefile | 6 +++--- compat/cygwin.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile index c3edf8c..c2ea735 100644 --- a/Makefile +++ b/Makefile @@ -1089,7 +1089,7 @@ ifeq ($(uname_O),Cygwin) NO_SYMLINK_HEAD = YesPlease NO_IPV6 = YesPlease OLD_ICONV = UnfortunatelyYes - V15_MINGW_HEADERS = YesPlease + CYGWIN_OLD_WINSOCK_HEADERS = YesPlease endif NO_THREAD_SAFE_PREAD = YesPlease NEEDS_LIBICONV = YesPlease @@ -1901,8 +1901,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_OLD_WINSOCK_HEADERS + COMPAT_CFLAGS += -DCYGWIN_OLD_WINSOCK_HEADERS endif ifdef USE_NED_ALLOCATOR diff --git a/compat/cygwin.c b/compat/cygwin.c index 59d86e4..b9f2862 100644 --- a/compat/cygwin.c +++ b/compat/cygwin.c @@ -1,5 +1,5 @@ #define WIN32_LEAN_AND_MEAN -#ifdef V15_MINGW_HEADERS +#ifdef CYGWIN_OLD_WINSOCK_HEADERS #include "../git-compat-util.h" #include "win32.h" #else
-- 1.7.12