summaryrefslogtreecommitdiff
path: root/evutil.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-01-22 22:27:16 -0500
committerNick Mathewson <nickm@torproject.org>2012-01-22 22:27:16 -0500
commit40a3c52d05cbf9a57c8ed595cb8a546e66dd13e4 (patch)
tree3b85f76b0e4bf3feae22921f9e5658588e5de0d7 /evutil.c
parent5683e2b1a8a472ada2b3dcd6b684723256bffa60 (diff)
downloadlibevent-40a3c52d05cbf9a57c8ed595cb8a546e66dd13e4.tar.gz
Fix compilation of windows evutil_check_ifaddrs
Diffstat (limited to 'evutil.c')
-rw-r--r--evutil.c8
1 files 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) {