Commit bc8d21b5 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

server: Don't include winsock.h to avoid creating a dependency on generated headers.

The dependency does not really exist thanks to various #ifdefs, but makedep does not know that and records it which causes a build failure.
parent 0c0c87a9
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#include "windef.h" #include "windef.h"
#include "winternl.h" #include "winternl.h"
#include "winerror.h"
#include "process.h" #include "process.h"
#include "file.h" #include "file.h"
...@@ -59,11 +60,34 @@ ...@@ -59,11 +60,34 @@
#include "request.h" #include "request.h"
#include "user.h" #include "user.h"
/* To avoid conflicts with the Unix socket headers. Plus we only need a few /* From winsock.h */
* macros anyway. #define FD_MAX_EVENTS 10
#define FD_READ_BIT 0
#define FD_WRITE_BIT 1
#define FD_OOB_BIT 2
#define FD_ACCEPT_BIT 3
#define FD_CONNECT_BIT 4
#define FD_CLOSE_BIT 5
/*
* Define flags to be used with the WSAAsyncSelect() call.
*/ */
#define USE_WS_PREFIX #define FD_READ 0x00000001
#include "winsock2.h" #define FD_WRITE 0x00000002
#define FD_OOB 0x00000004
#define FD_ACCEPT 0x00000008
#define FD_CONNECT 0x00000010
#define FD_CLOSE 0x00000020
/* internal per-socket flags */
#define FD_WINE_LISTENING 0x10000000
#define FD_WINE_NONBLOCKING 0x20000000
#define FD_WINE_CONNECTED 0x40000000
#define FD_WINE_RAW 0x80000000
#define FD_WINE_INTERNAL 0xFFFF0000
/* Constants for WSAIoctl() */
#define WSA_FLAG_OVERLAPPED 0x01
struct sock struct sock
{ {
......
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