[IPHLPAPI_WINETEST] Import htonl and co from ws2_32 instead of hacking things locally...

svn path=/trunk/; revision=70270

diff --git a/rostests/winetests/iphlpapi/CMakeLists.txt b/rostests/winetests/iphlpapi/CMakeLists.txt
index 83bc30a..0309020 100644 (file)
--- 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 27509b3..7d7c238 100644 (file)
--- 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);