From e8ce0215cf24ab2dc3aa5d279a82764a4d872e3e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 5 Dec 2015 16:40:43 +0000 Subject: [PATCH] [IPHLPAPI_WINETEST] Import htonl and co from ws2_32 instead of hacking things locally. ROSTESTS-206 svn path=/trunk/; revision=70270 --- rostests/winetests/iphlpapi/CMakeLists.txt | 2 +- rostests/winetests/iphlpapi/iphlpapi.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/rostests/winetests/iphlpapi/CMakeLists.txt b/rostests/winetests/iphlpapi/CMakeLists.txt index 83bc30aa67d..0309020e8a6 100644 --- a/rostests/winetests/iphlpapi/CMakeLists.txt +++ b/rostests/winetests/iphlpapi/CMakeLists.txt @@ -2,5 +2,5 @@ add_executable(iphlpapi_winetest iphlpapi.c testlist.c) target_link_libraries(iphlpapi_winetest wine) set_module_type(iphlpapi_winetest win32cui) -add_importlibs(iphlpapi_winetest msvcrt kernel32 ntdll) +add_importlibs(iphlpapi_winetest ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET iphlpapi_winetest DESTINATION reactos/bin FOR all) diff --git a/rostests/winetests/iphlpapi/iphlpapi.c b/rostests/winetests/iphlpapi/iphlpapi.c index 27509b3b2a8..7d7c238cd5a 100644 --- a/rostests/winetests/iphlpapi/iphlpapi.c +++ b/rostests/winetests/iphlpapi/iphlpapi.c @@ -48,16 +48,6 @@ #define ICMP_MINLEN 8 /* copied from dlls/iphlpapi/ip_icmp.h file */ -#undef htonl -#undef htons -#undef ntohl -#undef ntohs - -#define htonl(l) ((u_long)(l)) -#define htons(s) ((u_short)(s)) -#define ntohl(l) ((u_long)(l)) -#define ntohs(s) ((u_short)(s)) - static HMODULE hLibrary = NULL; static DWORD (WINAPI *pGetNumberOfInterfaces)(PDWORD);