[akhaldi] 61837: [WS2_32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Sun Jan 26 17:48:17 2014
New Revision: 61837

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

Modified:
    trunk/reactos/dll/win32/ws2_32/include/catalog.h
    trunk/reactos/dll/win32/ws2_32/include/debug.h
    trunk/reactos/dll/win32/ws2_32/include/handle.h
    trunk/reactos/dll/win32/ws2_32/include/upcall.h
    trunk/reactos/dll/win32/ws2_32/include/ws2_32.h
    trunk/reactos/dll/win32/ws2_32/misc/async.c
    trunk/reactos/dll/win32/ws2_32/misc/ns.c
    trunk/reactos/dll/win32/ws2_32/misc/stubs.c

Modified: trunk/reactos/dll/win32/ws2_32/include/catalog.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/ca...
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/include/catalog.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/include/catalog.h	[iso-8859-1] Sun Jan 26 17:48:17 2014
@@ -4,6 +4,7 @@
  * FILE:        include/catalog.h
  * PURPOSE:     Service Provider Catalog definitions
  */
+
 #ifndef __CATALOG_H
 #define __CATALOG_H

@@ -54,5 +55,3 @@
 VOID DestroyCatalog(VOID);

#endif /* __CATALOG_H */
-
-/* EOF */

Modified: trunk/reactos/dll/win32/ws2_32/include/debug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/de...
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/include/debug.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/include/debug.h	[iso-8859-1] Sun Jan 26 17:48:17 2014
@@ -6,6 +6,7 @@
  * DEFINES:     DBG     - Enable debug output
  *              NASSERT - Disable assertions
  */
+
 #ifndef __DEBUG_H
 #define __DEBUG_H

@@ -62,5 +63,3 @@
 #define CP CHECKPOINT

#endif /* __DEBUG_H */
-
-/* EOF */

Modified: trunk/reactos/dll/win32/ws2_32/include/handle.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/ha...
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/include/handle.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/include/handle.h	[iso-8859-1] Sun Jan 26 17:48:17 2014
@@ -4,10 +4,9 @@
  * FILE:        include/handle.h
  * PURPOSE:     Provider handle definitions
  */
+
 #ifndef __HANDLE_H
 #define __HANDLE_H
-
-//#include <catalog.h>

typedef struct _PROVIDER_HANDLE
 {
@@ -44,5 +43,3 @@
 FreeProviderHandleTable(VOID);

#endif /* __HANDLE_H */
-
-/* EOF */

Modified: trunk/reactos/dll/win32/ws2_32/include/upcall.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/up...
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/include/upcall.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/include/upcall.h	[iso-8859-1] Sun Jan 26 17:48:17 2014
@@ -4,6 +4,7 @@
  * FILE:        include/upcall.h
  * PURPOSE:     Upcall function defintions
  */
+
 #ifndef __UPCALL_H
 #define __UPCALL_H

@@ -100,5 +101,3 @@
     OUT LPINT lpErrno);

#endif /* __UPCALL_H */
-
-/* EOF */

Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/ws...
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/include/ws2_32.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/include/ws2_32.h	[iso-8859-1] Sun Jan 26 17:48:17 2014
@@ -4,22 +4,20 @@
  * FILE:        include/ws2_32.h
  * PURPOSE:     WinSock 2 DLL header
  */
+
 #ifndef __WS2_32_H
 #define __WS2_32_H

-#include <stdlib.h>
-#include <stdio.h>
+#include <stdarg.h>

#define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
-#include <winnls.h>
 #include <winuser.h>
 #include <ws2spi.h>
-#include <ws2tcpip.h>
 #define NTOS_MODE_USER
 #include <ndk/rtlfuncs.h>

@@ -31,7 +29,6 @@

#include "catalog.h"
 #include "handle.h"
-//#include "upcall.h"

#define EXPORT WINAPI

@@ -129,5 +126,3 @@
 #endif /* LE */

#endif /* __WS2_32_H */
-
-/* EOF */

Modified: trunk/reactos/dll/win32/ws2_32/misc/async.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/async...
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/misc/async.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/misc/async.c	[iso-8859-1] Sun Jan 26 17:48:17 2014
@@ -39,15 +39,12 @@
 #define COM_NO_WINDOWS_H

#include <wine/config.h>
-//#include "wine/port.h"

#include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
-//#include "wingdi.h"
 #include <winuser.h>
 #include <winsock2.h>
-//#include "ws2spi.h"

#include <wine/debug.h>

Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c?...
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/misc/ns.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/misc/ns.c	[iso-8859-1] Sun Jan 26 17:48:17 2014
@@ -9,6 +9,10 @@
  */

#include "ws2_32.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <winnls.h>

#ifndef BUFSIZ
 #define BUFSIZ 1024

Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stubs...
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/misc/stubs.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c	[iso-8859-1] Sun Jan 26 17:48:17 2014
@@ -9,6 +9,8 @@
  */

#include "ws2_32.h"
+
+#include <ws2tcpip.h>

/*
  * @implemented