diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-07 08:42:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-07 08:42:19 -0400 |
| commit | 4d0abd1b9b0478a8b25cf4b789fe371eea69f952 (patch) | |
| tree | 4a01f41168dfa7506ef0a3efb15be53b123fdf7a | |
| parent | 444fd57044c12f2f89d66940078b4c8397b55e8a (diff) | |
| parent | b6de39e5f465259b78d3886e0231d3dfef58fc1f (diff) | |
| download | tor-4d0abd1b9b0478a8b25cf4b789fe371eea69f952.tar.gz tor-4d0abd1b9b0478a8b25cf4b789fe371eea69f952.zip | |
Merge branch 'maint-0.3.4' into release-0.3.4
| -rw-r--r-- | changes/bug27465 | 5 | ||||
| -rw-r--r-- | src/common/address.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/bug27465 b/changes/bug27465 new file mode 100644 index 0000000000..743b35130f --- /dev/null +++ b/changes/bug27465 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation): + - Silence a spurious compiler warning on the GetAdaptersAddresses + function pointer cast. This issue is already fixed by 26481 in + 0.3.5 and later, by removing the lookup and cast. + Fixes bug 27465; bugfix on 0.2.3.11-alpha. diff --git a/src/common/address.c b/src/common/address.c index a32df99107..9446675712 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1496,7 +1496,10 @@ get_interface_addresses_win32(int severity, sa_family_t family) goto done; } - if (!(fn = (GetAdaptersAddresses_fn_t) + /* Cast through a void function pointer, to silence a spurious compiler + * warning on 64-bit Windows. This cast is safe, because we are casting to + * the correct type for GetAdaptersAddresses(). */ + if (!(fn = (GetAdaptersAddresses_fn_t)(void(*)(void)) GetProcAddress(lib, "GetAdaptersAddresses"))) { log_fn(severity, LD_NET, "Unable to obtain pointer to " "GetAdaptersAddresses"); |