mirror of
https://github.com/reactos/reactos.git
synced 2024-07-08 05:35:06 +00:00
[WS2_32]
* Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 svn path=/trunk/; revision=61837
This commit is contained in:
parent
1eec99d721
commit
1d30ac9d19
|
@ -4,6 +4,7 @@
|
|||
* FILE: include/catalog.h
|
||||
* PURPOSE: Service Provider Catalog definitions
|
||||
*/
|
||||
|
||||
#ifndef __CATALOG_H
|
||||
#define __CATALOG_H
|
||||
|
||||
|
@ -54,5 +55,3 @@ VOID CreateCatalog(VOID);
|
|||
VOID DestroyCatalog(VOID);
|
||||
|
||||
#endif /* __CATALOG_H */
|
||||
|
||||
/* EOF */
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
* DEFINES: DBG - Enable debug output
|
||||
* NASSERT - Disable assertions
|
||||
*/
|
||||
|
||||
#ifndef __DEBUG_H
|
||||
#define __DEBUG_H
|
||||
|
||||
|
@ -62,5 +63,3 @@ extern DWORD DebugTraceLevel;
|
|||
#define CP CHECKPOINT
|
||||
|
||||
#endif /* __DEBUG_H */
|
||||
|
||||
/* EOF */
|
||||
|
|
|
@ -4,11 +4,10 @@
|
|||
* FILE: include/handle.h
|
||||
* PURPOSE: Provider handle definitions
|
||||
*/
|
||||
|
||||
#ifndef __HANDLE_H
|
||||
#define __HANDLE_H
|
||||
|
||||
//#include <catalog.h>
|
||||
|
||||
typedef struct _PROVIDER_HANDLE
|
||||
{
|
||||
HANDLE Handle;
|
||||
|
@ -44,5 +43,3 @@ VOID
|
|||
FreeProviderHandleTable(VOID);
|
||||
|
||||
#endif /* __HANDLE_H */
|
||||
|
||||
/* EOF */
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
* FILE: include/upcall.h
|
||||
* PURPOSE: Upcall function defintions
|
||||
*/
|
||||
|
||||
#ifndef __UPCALL_H
|
||||
#define __UPCALL_H
|
||||
|
||||
|
@ -100,5 +101,3 @@ WPUSetEvent(
|
|||
OUT LPINT lpErrno);
|
||||
|
||||
#endif /* __UPCALL_H */
|
||||
|
||||
/* EOF */
|
||||
|
|
|
@ -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 @@ void free_servent(struct servent* s);
|
|||
#endif /* LE */
|
||||
|
||||
#endif /* __WS2_32_H */
|
||||
|
||||
/* EOF */
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -10,6 +10,10 @@
|
|||
|
||||
#include "ws2_32.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <winnls.h>
|
||||
|
||||
#ifndef BUFSIZ
|
||||
#define BUFSIZ 1024
|
||||
#endif/*BUFSIZ*/
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
|
||||
#include "ws2_32.h"
|
||||
|
||||
#include <ws2tcpip.h>
|
||||
|
||||
/*
|
||||
* @implemented
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue