tests/server/util: remove in6addr_any for recent MinGW #1379
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@MarcelRaad, thanks for your PR! By analyzing the history of the files in this pull request, we identified @yangtse, @bagder and @gknauf to be potential reviewers. |
jay
reviewed
Apr 2, 2017
| #if defined(ENABLE_IPV6) && defined(__MINGW32__) | ||
| #if (__W32API_MAJOR_VERSION < 3) || \ | ||
| ((__W32API_MAJOR_VERSION == 3) && (__W32API_MINOR_VERSION < 6)) | ||
| const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }}; |
There was a problem hiding this comment.
mingw-w64 mingw-w64-headers/include/ws2tcpip.h:
#define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }libcurl tests/server/util.c:
const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }};The extra braces appear to have been added to util.c in 14424f7. Original mingw defines that macro as {0} and it has to be {{{0}}} to avoid a missing braces warning at some levels.
Re fix, it's fine but the comment is superfluous since the check makes it obvious.
bagder
approved these changes
Apr 2, 2017
In ancient MinGW versions, in6addr_any was declared as extern, but not defined. Because of that, 22a0c57 added definitions for in6addr_any when compiling with MinGW. The bug was fixed in w32api version 3.6 from 2006, so this workaround is not needed anymore for recent versions. This fixes the following MinGW-w64 warnings because the MinGW-w64 version of IN6ADDR_ANY_INIT has the two additional braces inside the macro: util.c:59:14: warning: braces around scalar initializer util.c:59:40: warning: excess elements in scalar initializer Ref: https://sourceforge.net/p/mingw/mingw-org-wsl/ci/e4803e0da25c57ae1ad0fa75ae2b7182ff7fa339/tree/w32api/ChangeLog Closes curl#1379
MarcelRaad
force-pushed
the
util_initializer
branch
from
d5dd952 to
55f4aba
Compare
|
Thanks! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In ancient MinGW versions,
in6addr_anywas declared as extern, but notdefined. Because of that, 22a0c57 added
definitions for
in6addr_anywhen compiling with MinGW. The bug was fixed inw32api version 3.6 from 2006, so this workaround is not needed anymore for
recent versions.
This fixes the following MinGW-w64 warnings because the MinGW-w64 version of
IN6ADDR_ANY_INIThas the two additional braces inside the macro:util.c:59:14: warning: braces around scalar initializer
util.c:59:40: warning: excess elements in scalar initializer
Ref: https://sourceforge.net/p/mingw/mingw-org-wsl/ci/e4803e0da25c57ae1ad0fa75ae2b7182ff7fa339/tree/w32api/ChangeLog
An alternative would be to remove support for these ancient MinGW versions
and just remove the redefinition of
inaddr_any, of course.