Merge remote-tracking branch 'teor/ticket27467'

This commit is contained in:
Nick Mathewson
2018-09-06 09:24:47 -04:00
2 changed files with 3 additions and 5 deletions
+3
View File
@@ -0,0 +1,3 @@
o Code simplification and refactoring:
- Remove GetAdaptersAddresses_fn_t. The code that used it was removed
as part of the 26481 refactor. Closes ticket 27467.
-5
View File
@@ -1205,11 +1205,6 @@ tor_addr_parse(tor_addr_t *addr, const char *src)
return result;
}
#ifdef _WIN32
typedef ULONG (WINAPI *GetAdaptersAddresses_fn_t)(
ULONG, ULONG, PVOID, PIP_ADAPTER_ADDRESSES, PULONG);
#endif
#ifdef HAVE_IFADDRS_TO_SMARTLIST
/*
* Convert a linked list consisting of <b>ifaddrs</b> structures