From 6c501cb6248c67e5f1feaf74f1f616466814caa4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 22 Jun 2022 00:06:48 +0000 Subject: [PATCH] Makefile.m32: stop forcing XP target with ipv6 enabled [ci skip] Since this [1] commit in 2011, `_WIN32_WINNT` was set fixed to Windows XP when the `-ipv6` option is selected. Maybe this was added to support pre-XP Windows versions (?). These days libcurl builds fine for both XP and post-XP versions with IPv6 support enabled. The relevance of pre-XP version is also low by now. Other build methods also do not impose such limitation for a similar configuration. So, drop this hard-wired `_WIN32_WINNT` limit from `Makefile.m32`, thus building for the default Windows version set by the compiler. This is Vista for recent MinGW versions. Old behaviour can be restored by setting this envvar: export CURL_CFLAG_EXTRAS=-D_WIN32_WINNT=0x0501 [1] 98a61d8e2e8982786aaf3916cbbcac96838316e7 Closes #9035 --- docs/examples/Makefile.m32 | 2 +- lib/Makefile.m32 | 2 +- src/Makefile.m32 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32 index 71369487a7..15eaf82b3a 100644 --- a/docs/examples/Makefile.m32 +++ b/docs/examples/Makefile.m32 @@ -356,7 +356,7 @@ ifdef SSPI CFLAGS += -DUSE_WINDOWS_SSPI endif ifdef IPV6 - CFLAGS += -DENABLE_IPV6 -D_WIN32_WINNT=0x0501 + CFLAGS += -DENABLE_IPV6 endif ifdef LDAPS CFLAGS += -DHAVE_LDAP_SSL diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 227e4e95c9..1987b237e5 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -380,7 +380,7 @@ ifdef SPNEGO CFLAGS += -DHAVE_SPNEGO endif ifdef IPV6 - CFLAGS += -DENABLE_IPV6 -D_WIN32_WINNT=0x0501 + CFLAGS += -DENABLE_IPV6 endif ifdef LDAPS CFLAGS += -DHAVE_LDAP_SSL diff --git a/src/Makefile.m32 b/src/Makefile.m32 index a5ae2bec90..b3d3cf9631 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -381,7 +381,7 @@ ifdef SSPI CFLAGS += -DUSE_WINDOWS_SSPI endif ifdef IPV6 - CFLAGS += -DENABLE_IPV6 -D_WIN32_WINNT=0x0501 + CFLAGS += -DENABLE_IPV6 endif ifdef LDAPS CFLAGS += -DHAVE_LDAP_SSL