{"thread":{"id":"32133","subject":"[PATCH] Rename V15_MINGW_HEADERS into CYGWIN_OLD_WINSOCK_HEADERS","startedAt":"2012-11-17T07:09:49Z","lastAt":"2012-11-18T21:16:52Z","messageCount":4,"participants":["Torsten Bögershausen","Mark Levedahl","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"203394","messageId":"201211170809.50395.tboegi@web.de","threadId":"32133","inReplyTo":null,"subject":"[PATCH] Rename V15_MINGW_HEADERS into CYGWIN_OLD_WINSOCK_HEADERS","fromName":"Torsten Bögershausen","fromEmail":"tboegi@web.de","sentAt":"2012-11-17T07:09:49Z","receivedAt":"2012-11-17T07:09:49Z","isPatch":true,"sender":{"key":"tboegi@web.de","avatar":"https://avatars.githubusercontent.com/u/7138363?v=4"},"body":"See commit 380a4d927bff693c42fc6b22c3547bdcaac4bdc3:\n\"Update cygwin.c for new mingw-64 win32 api headers\"\nCygwin up to 1.7.16 uses some header file from the WINE project\nCygwin 1.7.17 uses some header file from the mingw-64 project\nAs the old cygwin (like 1.5) never used mingw,\nthe name V15_MINGW_HEADERS is confusing.\nRename it into CYGWIN_OLD_WINSOCK_HEADERS\n\nAddtional note:\nCygwin versions 1.7.1 up to 1.7.16 are expected to upgrade to \nCygwin 1.7.17 or higher\nAs a temporary workaround make can be run as\nCYGWIN_OLD_WINSOCK_HEADERS=Yes make\n\n\nSigned-off-by: Torsten Bögershausen \n---\n Makefile | 6 +++---\n compat/cygwin.c | 2 +-\n 2 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex c3edf8c..c2ea735 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1089,7 +1089,7 @@ ifeq ($(uname_O),Cygwin)\n \t\tNO_SYMLINK_HEAD = YesPlease\n \t\tNO_IPV6 = YesPlease\n \t\tOLD_ICONV = UnfortunatelyYes\n-\t\tV15_MINGW_HEADERS = YesPlease\n+\t\tCYGWIN_OLD_WINSOCK_HEADERS = YesPlease\n \tendif\n \tNO_THREAD_SAFE_PREAD = YesPlease\n \tNEEDS_LIBICONV = YesPlease\n@@ -1901,8 +1901,8 @@ ifdef NO_REGEX\n \tCOMPAT_CFLAGS += -Icompat/regex\n \tCOMPAT_OBJS += compat/regex/regex.o\n endif\n-ifdef V15_MINGW_HEADERS\n-\tCOMPAT_CFLAGS += -DV15_MINGW_HEADERS\n+ifdef CYGWIN_OLD_WINSOCK_HEADERS\n+\tCOMPAT_CFLAGS += -DCYGWIN_OLD_WINSOCK_HEADERS\n endif\n \n ifdef USE_NED_ALLOCATOR\ndiff --git a/compat/cygwin.c b/compat/cygwin.c\nindex 59d86e4..b9f2862 100644\n--- a/compat/cygwin.c\n+++ b/compat/cygwin.c\n@@ -1,5 +1,5 @@\n #define WIN32_LEAN_AND_MEAN\n-#ifdef V15_MINGW_HEADERS\n+#ifdef CYGWIN_OLD_WINSOCK_HEADERS\n #include \"../git-compat-util.h\"\n #include \"win32.h\"\n #else\n-- \n1.7.12\n"},{"id":"203423","messageId":"50A7A161.9020805@gmail.com","threadId":"32133","inReplyTo":"201211170809.50395.tboegi@web.de","subject":"Re: [PATCH] Rename V15_MINGW_HEADERS into CYGWIN_OLD_WINSOCK_HEADERS","fromName":"Mark Levedahl","fromEmail":"mlevedahl@gmail.com","sentAt":"2012-11-17T14:38:25Z","receivedAt":"2012-11-17T14:38:25Z","isPatch":true,"sender":{"key":"mdl123@verizon.net","avatar":"https://avatars.githubusercontent.com/u/5302462?v=4"},"body":"On 11/17/2012 02:09 AM, Torsten Bögershausen wrote:\n> See commit 380a4d927bff693c42fc6b22c3547bdcaac4bdc3:\n> \"Update cygwin.c for new mingw-64 win32 api headers\"\n> Cygwin up to 1.7.16 uses some header file from the WINE project\n> Cygwin 1.7.17 uses some header file from the mingw-64 project\n> As the old cygwin (like 1.5) never used mingw,\n> the name V15_MINGW_HEADERS is confusing.\n> Rename it into CYGWIN_OLD_WINSOCK_HEADERS\n>\n>\n> diff --git a/Makefile b/Makefile\n> index c3edf8c..c2ea735 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -1089,7 +1089,7 @@ ifeq ($(uname_O),Cygwin)\n> \t\tNO_SYMLINK_HEAD = YesPlease\n> \t\tNO_IPV6 = YesPlease\n> \t\tOLD_ICONV = UnfortunatelyYes\n> -\t\tV15_MINGW_HEADERS = YesPlease\n> +\t\tCYGWIN_OLD_WINSOCK_HEADERS = YesPlease\n> \nWINSOCK is certainly a part of the win32 api implementation, but it is \nis the entire win32api that changed, not just the tiny bit dealing with \nsockets.\nBasically, WINDOWS.h, and everything it includes, and all of the dlls it \ntouches, and the .o files, changed. Calling it \"OLD\" is not helpful, \nwhat happens in the future with the next change? The only version info \nwe really have is the dll version. We are switching between the win32 \napi implementation shipped with cygwin dll version 1.5.x and the one \nthat is now current. And, the shift is not tied to any particular cygwin \n1.7.x dll version either (there are no cross dependencies between the \nwin32api implementation and any particular dll in the 1.7.x series, just \na coincidence in time as to what packages got updated when). So my \nsuggestion in the bike shedding category is to\n\ns/V15_MINGW_HEADERS/CYGWIN_V15_WIN32API/\n\n/end of bike shedding.\n\nIf this is really worth a second patch, I'll be happy to send one :^)\n\nMark\n"},{"id":"203453","messageId":"7va9ufjqu1.fsf@alter.siamese.dyndns.org","threadId":"32133","inReplyTo":"50A7A161.9020805@gmail.com","subject":"Re: [PATCH] Rename V15_MINGW_HEADERS into CYGWIN_OLD_WINSOCK_HEADERS","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-11-18T07:46:46Z","receivedAt":"2012-11-18T07:46:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Mark Levedahl writes:\n\n>> ...\n>> -\t\tV15_MINGW_HEADERS = YesPlease\n>> +\t\tCYGWIN_OLD_WINSOCK_HEADERS = YesPlease\n>> \n> WINSOCK is certainly a part of the win32 api implementation, but it is\n> is the entire win32api that changed, not just the tiny bit dealing\n> with sockets.\n> Basically, WINDOWS.h, and everything it includes, and all of the dlls\n> it touches, and the .o files, changed.\n> ... So my suggestion in the bike shedding\n> category is to\n>\n> s/V15_MINGW_HEADERS/CYGWIN_V15_WIN32API/\n\nSounds sensible.\n"},{"id":"203497","messageId":"1353273412-4164-1-git-send-email-mlevedahl@gmail.com","threadId":"32133","inReplyTo":"7va9ufjqu1.fsf@alter.siamese.dyndns.org","subject":"[PATCH] USE CGYWIN_V15_WIN32API as macro to select api for cygwin","fromName":"Mark Levedahl","fromEmail":"mlevedahl@gmail.com","sentAt":"2012-11-18T21:16:52Z","receivedAt":"2012-11-18T21:16:52Z","isPatch":true,"sender":{"key":"mdl123@verizon.net","avatar":"https://avatars.githubusercontent.com/u/5302462?v=4"},"body":"The previous macro was confusing to some, and did not include \"cygwin\" in\nits name. The updated name more clearly expresses a choice of the\nwin32api implementation that shipped with version 1.5 of cygwin.\n\nSigned-off-by: Mark Levedahl \n---\n Makefile | 6 +++---\n compat/cygwin.c | 2 +-\n 2 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex cf0ecde..9731c85 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1091,7 +1091,7 @@ ifeq ($(uname_O),Cygwin)\n \t\tNO_SYMLINK_HEAD = YesPlease\n \t\tNO_IPV6 = YesPlease\n \t\tOLD_ICONV = UnfortunatelyYes\n-\t\tV15_MINGW_HEADERS = YesPlease\n+\t\tCYGWIN_V15_WIN32API = YesPlease\n \tendif\n \tNO_THREAD_SAFE_PREAD = YesPlease\n \tNEEDS_LIBICONV = YesPlease\n@@ -1906,8 +1906,8 @@ ifdef NO_REGEX\n \tCOMPAT_CFLAGS += -Icompat/regex\n \tCOMPAT_OBJS += compat/regex/regex.o\n endif\n-ifdef V15_MINGW_HEADERS\n-\tCOMPAT_CFLAGS += -DV15_MINGW_HEADERS\n+ifdef CYGWIN_V15_WIN32API\n+\tCOMPAT_CFLAGS += -DCYGWIN_V15_WIN32API\n endif\n \n ifdef USE_NED_ALLOCATOR\ndiff --git a/compat/cygwin.c b/compat/cygwin.c\nindex 59d86e4..5428858 100644\n--- a/compat/cygwin.c\n+++ b/compat/cygwin.c\n@@ -1,5 +1,5 @@\n #define WIN32_LEAN_AND_MEAN\n-#ifdef V15_MINGW_HEADERS\n+#ifdef CYGWIN_V15_WIN32API\n #include \"../git-compat-util.h\"\n #include \"win32.h\"\n #else\n-- \n1.8.0.0.0.14\n"}]}