From 40a3c52d05cbf9a57c8ed595cb8a546e66dd13e4 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 22 Jan 2012 22:27:16 -0500 Subject: [PATCH] Fix compilation of windows evutil_check_ifaddrs --- evutil.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/evutil.c b/evutil.c index 8d6ab88d..4f0cfcd2 100644 --- a/evutil.c +++ b/evutil.c @@ -576,6 +576,11 @@ evutil_found_ifaddr(const struct sockaddr *sa) } } +#ifdef _WIN32 +typedef ULONG (WINAPI *GetAdaptersAddresses_fn_t)( + ULONG, ULONG, PVOID, PIP_ADAPTER_ADDRESSES, PULONG); +#endif + static int evutil_check_ifaddrs(void) { @@ -627,7 +632,7 @@ evutil_check_ifaddrs(void) if (res == ERROR_BUFFER_OVERFLOW) { /* we didn't guess that we needed enough space; try again */ mm_free(addresses); - addresses = tor_malloc(size); + addresses = mm_malloc(size); if (!addresses) goto done; res = fn(AF_UNSPEC, FLAGS, NULL, addresses, &size); @@ -635,7 +640,6 @@ evutil_check_ifaddrs(void) if (res != NO_ERROR) goto done; - result = smartlist_create(); for (address = addresses; address; address = address->Next) { IP_ADAPTER_UNICAST_ADDRESS *a; for (a = address->FirstUnicastAddress; a; a = a->Next) {