Commit 15f0ac35 authored by Alexandre Julliard's avatar Alexandre Julliard

Yet another hack to try to make this file compile in all

circumstances.
parent 961afa2a
......@@ -26,22 +26,8 @@
# endif
#endif
#ifndef _WINSOCKAPI_
#define _WINSOCKAPI_
/*
* Setup phase
*/
#ifdef USE_WS_PREFIX
# define WS(x) WS_##x
#else
# define WS(x) x
#endif
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
#ifndef __WINE_WINSOCKAPI_STDLIB_H
#define __WINE_WINSOCKAPI_STDLIB_H
/*
* This section defines the items that conflict with the Unix headers.
......@@ -110,12 +96,17 @@ extern "C" {
# include <stdlib.h>
#endif /* !USE_WS_PREFIX */
#endif /* __WINE_WINSOCKAPI_STDLIB_H */
#ifndef __WINESRC__
# include "windows.h"
#else
# include "windef.h"
#endif
#ifndef _WINSOCKAPI_
#define _WINSOCKAPI_
#if defined(__MINGW_H) && !defined(MSVCRT_BSD_TYPES_DEFINED)
/* MinGW doesn't define the u_xxx types */
typedef unsigned char u_char;
......@@ -124,6 +115,16 @@ typedef unsigned int u_int;
typedef unsigned long u_long;
#endif
#ifdef USE_WS_PREFIX
# define WS(x) WS_##x
#else
# define WS(x) x
#endif
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
/* proper 4-byte packing */
#include "pshpack4.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment