[akhaldi] 70270: [IPHLPAPI_WINETEST] Import htonl and co from ws2_32 instead of hacking things locally. ROSTESTS-206

Author: akhaldi
Date: Sat Dec  5 16:40:43 2015
New Revision: 70270

URL: http://svn.reactos.org/svn/reactos?rev=70270&view=rev
Log:
[IPHLPAPI_WINETEST] Import htonl and co from ws2_32 instead of hacking things locally. ROSTESTS-206

Modified:
    trunk/rostests/winetests/iphlpapi/CMakeLists.txt
    trunk/rostests/winetests/iphlpapi/iphlpapi.c

Modified: trunk/rostests/winetests/iphlpapi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/iphlpapi/CMakeLi...
==============================================================================
--- trunk/rostests/winetests/iphlpapi/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/iphlpapi/CMakeLists.txt	[iso-8859-1] Sat Dec  5 16:40:43 2015
@@ -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)

Modified: trunk/rostests/winetests/iphlpapi/iphlpapi.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/iphlpapi/iphlpap...
==============================================================================
--- trunk/rostests/winetests/iphlpapi/iphlpapi.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/iphlpapi/iphlpapi.c	[iso-8859-1] Sat Dec  5 16:40:43 2015
@@ -47,16 +47,6 @@
 #include <stdlib.h>

#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;