Yet another hack to try to make this file compile in all
circumstances.
This commit is contained in:
parent
961afa2ab6
commit
15f0ac352b
|
@ -26,22 +26,8 @@
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef _WINSOCKAPI_
|
#ifndef __WINE_WINSOCKAPI_STDLIB_H
|
||||||
#define _WINSOCKAPI_
|
#define __WINE_WINSOCKAPI_STDLIB_H
|
||||||
|
|
||||||
/*
|
|
||||||
* Setup phase
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef USE_WS_PREFIX
|
|
||||||
# define WS(x) WS_##x
|
|
||||||
#else
|
|
||||||
# define WS(x) x
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif /* defined(__cplusplus) */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This section defines the items that conflict with the Unix headers.
|
* This section defines the items that conflict with the Unix headers.
|
||||||
|
@ -110,12 +96,17 @@ extern "C" {
|
||||||
# include <stdlib.h>
|
# include <stdlib.h>
|
||||||
#endif /* !USE_WS_PREFIX */
|
#endif /* !USE_WS_PREFIX */
|
||||||
|
|
||||||
|
#endif /* __WINE_WINSOCKAPI_STDLIB_H */
|
||||||
|
|
||||||
#ifndef __WINESRC__
|
#ifndef __WINESRC__
|
||||||
# include "windows.h"
|
# include "windows.h"
|
||||||
#else
|
#else
|
||||||
# include "windef.h"
|
# include "windef.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef _WINSOCKAPI_
|
||||||
|
#define _WINSOCKAPI_
|
||||||
|
|
||||||
#if defined(__MINGW_H) && !defined(MSVCRT_BSD_TYPES_DEFINED)
|
#if defined(__MINGW_H) && !defined(MSVCRT_BSD_TYPES_DEFINED)
|
||||||
/* MinGW doesn't define the u_xxx types */
|
/* MinGW doesn't define the u_xxx types */
|
||||||
typedef unsigned char u_char;
|
typedef unsigned char u_char;
|
||||||
|
@ -124,6 +115,16 @@ typedef unsigned int u_int;
|
||||||
typedef unsigned long u_long;
|
typedef unsigned long u_long;
|
||||||
#endif
|
#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 */
|
/* proper 4-byte packing */
|
||||||
#include "pshpack4.h"
|
#include "pshpack4.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue