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 | b6de39e5f465259b78d3886e0231d3dfef58fc1f (patch) | |
| tree | c0ebab242baf94e07248a3fbb9635f66d8aef2af /src/common | |
| parent | 2b04163666ae22b4df81b868374bbd449614cc2b (diff) | |
| parent | 08d5fd39d85d4f7174b52ef5d53db001398481ea (diff) | |
| download | tor-b6de39e5f465259b78d3886e0231d3dfef58fc1f.tar.gz tor-b6de39e5f465259b78d3886e0231d3dfef58fc1f.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/address.c | 5 |
1 files changed, 4 insertions, 1 deletions
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"); |