Rename V15_MINGW_HEADERS into CYGWIN_OLD_WINSOCK_HEADERS
PATCH 1/1 Rename V15_MINGW_HEADERS into CYGWIN_OLD_WINSOCK_HEADERS
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
--- Makefile | 6 +++--- compat/cygwin.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
Makefile +3 -3
@@ -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
compat/cygwin.c +1 -1
@@ -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
Signature · 1 line
1.7.12
Quoted 14 lines · Torsten Bögershausen
See commit
380a4d927bff693c42fc6b22c3547bdcaac4bdc3:
"Updatecygwin.cfor 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 nameV15_MINGW_HEADERSis confusing.
Rename it intoCYGWIN_OLD_WINSOCK_HEADERSMakefile +0
-0
Makefile ifeq ($(uname_O),Cygwin) · line 1093
Quoted 6 lines
Makefile +1
-1@@ -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
WINSOCK is certainly a part of the win32 api implementation, but it is is the entire win32api that changed, not just the tiny bit dealing with sockets.
Basically, WINDOWS.h, and everything it includes, and all of the dlls it touches, and the .o files, changed. Calling it "OLD" is not helpful, what happens in the future with the next change? The only version info we really have is the dll version. We are switching between the win32 api implementation shipped with cygwin dll version 1.5.x and the one that is now current. And, the shift is not tied to any particular cygwin 1.7.x dll version either (there are no cross dependencies between the win32api implementation and any particular dll in the 1.7.x series, just a coincidence in time as to what packages got updated when). So my suggestion in the bike shedding category is to
s/V15_MINGW_HEADERS/CYGWIN_V15_WIN32API/
/end of bike shedding.
If this is really worth a second patch, I'll be happy to send one :^)
Mark
Quoted 12 lines · Mark Levedahl
Makefile ifeq ($(uname_O),Cygwin) · line 1092
Quoted 4 lines
...
Makefile +1
-1- V15_MINGW_HEADERS = YesPlease + CYGWIN_OLD_WINSOCK_HEADERS = YesPleaseWINSOCK is certainly a part of the win32 api implementation, but it is is the entire win32api that changed, not just the tiny bit dealing with sockets.
Basically,WINDOWS.h, and everything it includes, and all of the dlls it touches, and the .o files, changed.
... So my suggestion in the bike shedding
category is to
Quoted 1 line
s/V15_MINGW_HEADERS/CYGWIN_V15_WIN32API/
Sounds sensible.
PATCH 1/1 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.
--- Makefile | 6 +++--- compat/cygwin.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
Makefile +3 -3
@@ -1091,7 +1091,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
@@ -1906,8 +1906,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
compat/cygwin.c +1 -1
@@ -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
Signature · 1 line
1.8.0.0.0.14