From f691389e82699033a3973d1b2c298b0c820b3b64 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 29 Aug 2014 14:28:09 -0400 Subject: [PATCH] Change return type of evutil_load_windows_system_library_ to HMODULE Noted by Miles Chan as issue #146 --- evutil.c | 4 ++-- test/regress_util.c | 2 +- util-internal.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/evutil.c b/evutil.c index 5690d49756..df93e67f05 100644 --- a/evutil.c +++ b/evutil.c @@ -652,7 +652,7 @@ evutil_check_ifaddrs(void) "GetAdaptersInfo", but that's deprecated; let's just try GetAdaptersAddresses and fall back to connect+getsockname. */ - HANDLE lib = evutil_load_windows_system_library_(TEXT("ihplapi.dll")); + HMODULE lib = evutil_load_windows_system_library_(TEXT("ihplapi.dll")); GetAdaptersAddresses_fn_t fn; ULONG size, res; IP_ADAPTER_ADDRESSES *addresses = NULL, *address; @@ -2453,7 +2453,7 @@ evutil_hex_char_to_int_(char c) } #ifdef _WIN32 -HANDLE +HMODULE evutil_load_windows_system_library_(const TCHAR *library_name) { TCHAR path[MAX_PATH]; diff --git a/test/regress_util.c b/test/regress_util.c index 15331b6ae1..60f085bf1d 100644 --- a/test/regress_util.c +++ b/test/regress_util.c @@ -1121,7 +1121,7 @@ test_evutil_getaddrinfo_live(void *arg) static void test_evutil_loadsyslib(void *arg) { - HANDLE h=NULL; + HMODULE h=NULL; h = evutil_load_windows_system_library_(TEXT("kernel32.dll")); tt_assert(h); diff --git a/util-internal.h b/util-internal.h index 5866dbc518..4fdedeaf93 100644 --- a/util-internal.h +++ b/util-internal.h @@ -392,7 +392,7 @@ void evutil_free_secure_rng_globals_(void); void evutil_free_globals_(void); #ifdef _WIN32 -HANDLE evutil_load_windows_system_library_(const TCHAR *library_name); +HMODULE evutil_load_windows_system_library_(const TCHAR *library_name); #endif #ifndef EV_SIZE_FMT