diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-14 15:03:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-14 15:10:22 (GMT) |
| commit | a3ef36f153f51c33ea2154cff17bbf9abb7ee073 (patch) | |
| tree | 94283929f1d08444c255a490d10810d7c5df0e04 /Utilities/cmcurl/lib/if2ip.c | |
| parent | 91101f108d68e8fe98c378f06e1ed12a513151fe (diff) | |
| parent | 06d6d6c4aee149cd6560b919ef6935ef0867d921 (diff) | |
| download | CMake-a3ef36f153f51c33ea2154cff17bbf9abb7ee073.zip CMake-a3ef36f153f51c33ea2154cff17bbf9abb7ee073.tar.gz CMake-a3ef36f153f51c33ea2154cff17bbf9abb7ee073.tar.bz2 | |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2017-06-14 (54b636f1)
Resolve a logical conflict in `Utilities/cmcurl/CMakeLists.txt`
by disabling CA bundle/path detection for build within CMake.
CMake already handles locating a CA bundle/path at runtime.
Diffstat (limited to 'Utilities/cmcurl/lib/if2ip.c')
| -rw-r--r-- | Utilities/cmcurl/lib/if2ip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmcurl/lib/if2ip.c b/Utilities/cmcurl/lib/if2ip.c index d876615..4de81be 100644 --- a/Utilities/cmcurl/lib/if2ip.c +++ b/Utilities/cmcurl/lib/if2ip.c @@ -239,7 +239,7 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope, return IF2IP_NOT_FOUND; } - s = (struct sockaddr_in *)&req.ifr_addr; + s = (struct sockaddr_in *)(void *)&req.ifr_addr; memcpy(&in, &s->sin_addr, sizeof(in)); Curl_inet_ntop(s->sin_family, &in, buf, buf_size); |