Author: akhaldi Date: Wed Aug 10 22:40:12 2011 New Revision: 53168
URL: http://svn.reactos.org/svn/reactos?rev=53168&view=rev Log: [WS2_32_NEW][WS2HELP] * Add PCHs.
Modified: trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild trunk/reactos/dll/win32/ws2help/CMakeLists.txt trunk/reactos/dll/win32/ws2help/precomp.h trunk/reactos/dll/win32/ws2help/ws2help.rbuild
Modified: trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/CMakeL... ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] Wed Aug 10 22:40:12 2011 @@ -48,8 +48,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def)
add_library(ws2_32_new SHARED ${SOURCE}) - set_module_type(ws2_32_new win32dll) +add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) +add_pch(ws2_32_new inc/ws2_32.h) target_link_libraries(ws2_32_new wine) -add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_cd_file(TARGET ws2_32_new DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/ws... ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] Wed Aug 10 22:40:12 2011 @@ -4,8 +4,6 @@ * FILE: lib/ws2_32.h * PURPOSE: WinSock 2.2 Main Header */ - -#pragma once
/* Definitions for NDK Usage */ #define WIN32_NO_STATUS @@ -28,6 +26,8 @@ /* Winsock Helper Header */ #include <ws2help.h>
+#include <nsp_dns.h> + /* Missing definitions */ #define SO_OPENTYPE 0x7008 #define SO_SYNCHRONOUS_NONALERT 0x20
Modified: trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/ge... ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] Wed Aug 10 22:40:12 2011 @@ -8,7 +8,6 @@
/* INCLUDES ******************************************************************/ #include "ws2_32.h" -#include <nsp_dns.h>
//#define NDEBUG #include <debug.h>
Modified: trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/ws2_32... ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] Wed Aug 10 22:40:12 2011 @@ -9,6 +9,9 @@ <library>advapi32</library> <library>dnsapi</library> <library>ws2help</library> + <directory name="inc"> + <pch>ws2_32.h</pch> + </directory> <directory name="src"> <file>addrconv.c</file> <file>addrinfo.c</file>
Modified: trunk/reactos/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/CMakeList... ============================================================================== --- trunk/reactos/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] Wed Aug 10 22:40:12 2011 @@ -12,8 +12,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def)
add_library(ws2help SHARED ${SOURCE}) - set_module_type(ws2help win32dll) add_importlibs(ws2help advapi32 ws2_32 msvcrt kernel32 ntdll) +add_pch(ws2help precomp.h) add_cd_file(TARGET ws2help DESTINATION reactos/system32 FOR all) add_importlib_target(ws2help.spec)
Modified: trunk/reactos/dll/win32/ws2help/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/precomp.h... ============================================================================== --- trunk/reactos/dll/win32/ws2help/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/precomp.h [iso-8859-1] Wed Aug 10 22:40:12 2011 @@ -20,7 +20,7 @@
/* Shared Winsock Helper headers */ #include <ws2help.h> -#include <wshdrv.h> +#include "wshdrv.h"
/* Missing definition */ #define SO_OPENTYPE 0x20
Modified: trunk/reactos/dll/win32/ws2help/ws2help.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/ws2help.r... ============================================================================== --- trunk/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] Wed Aug 10 22:40:12 2011 @@ -11,4 +11,5 @@ <file>handle.c</file> <file>notify.c</file> <file>ws2help.rc</file> + <pch>precomp.h</pch> </module>