[ros-diffs] [akhaldi] 61840: [WS2HELP] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716

Author: akhaldi
Date: Sun Jan 26 19:57:03 2014
New Revision: 61840

URL: http://svn.reactos.org/svn/reactos?rev=61840&view=rev
Log:
[WS2HELP]
* Remove one time inclusions from the main header and put them back where they belong.
CORE-7716

Modified:
    trunk/reactos/dll/win32/ws2help/context.c
    trunk/reactos/dll/win32/ws2help/handle.c
    trunk/reactos/dll/win32/ws2help/precomp.h
    trunk/reactos/dll/win32/ws2help/wshdrv.h

Modified: trunk/reactos/dll/win32/ws2help/context.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/context.c...
==============================================================================
--- trunk/reactos/dll/win32/ws2help/context.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2help/context.c	[iso-8859-1] Sun Jan 26 19:57:03 2014
@@ -8,6 +8,8 @@
 /* INCLUDES ******************************************************************/

#include "precomp.h"
+
+#include <ws2help.h>

/* DATA **********************************************************************/

Modified: trunk/reactos/dll/win32/ws2help/handle.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/handle.c?...
==============================================================================
--- trunk/reactos/dll/win32/ws2help/handle.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2help/handle.c	[iso-8859-1] Sun Jan 26 19:57:03 2014
@@ -8,6 +8,10 @@
 /* INCLUDES ******************************************************************/

#include "precomp.h"
+
+#include <ndk/iofuncs.h>
+
+#include "wshdrv.h"

/* DATA **********************************************************************/

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] Sun Jan 26 19:57:03 2014
@@ -4,6 +4,7 @@
  * FILE:        lib/ws2help/precomp.h
  * PURPOSE:     WinSock 2 Helper DLL
  */
+
 #ifndef __PRECOMP_H
 #define __PRECOMP_H

@@ -16,6 +17,7 @@
 #define INCL_WINSOCK_API_TYPEDEFS 1

#include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
@@ -23,12 +25,7 @@
 #include <ws2spi.h>

/* NDK Headers */
-#include <rtlfuncs.h>
-#include <iofuncs.h>
-
-/* Shared Winsock Helper headers */
-#include <ws2help.h>
-#include "wshdrv.h"
+#include <ndk/rtlfuncs.h>

/* Missing definition */
 #define SO_OPENTYPE 0x20
@@ -50,6 +47,4 @@
 #define WS2HELP_PROLOG() \
     (Ws2helpInitialized? ERROR_SUCCESS : Ws2helpInitialize())

-#endif /* __WS2HELP_H */
-
-/* EOF */
+#endif /* __PRECOMP_H */

Modified: trunk/reactos/dll/win32/ws2help/wshdrv.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/wshdrv.h?...
==============================================================================
--- trunk/reactos/dll/win32/ws2help/wshdrv.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2help/wshdrv.h	[iso-8859-1] Sun Jan 26 19:57:03 2014
@@ -25,4 +25,4 @@

#define IOCTL_WS2IFSL_SET_HANDLE 0x12B00

-#endif
+#endif /* __WSHDRV_H */