From 850aa4fc6bc2bf3d0fcafe1625776f7e12b31a8f Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Sat, 9 Aug 2014 13:46:05 -0600 Subject: [PATCH] Add explicit include on wtypes.h in the address change patchset (should fix multithreaded compile). --- ...lement-socket-specific-ioctl-routine.patch | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/patches/server-Address_Change_Notification/0001-server-Implement-socket-specific-ioctl-routine.patch b/patches/server-Address_Change_Notification/0001-server-Implement-socket-specific-ioctl-routine.patch index 14942c0c..559dd3f0 100644 --- a/patches/server-Address_Change_Notification/0001-server-Implement-socket-specific-ioctl-routine.patch +++ b/patches/server-Address_Change_Notification/0001-server-Implement-socket-specific-ioctl-routine.patch @@ -1,26 +1,27 @@ -From a0625ca7d07703028fdad511c37c587e213ff481 Mon Sep 17 00:00:00 2001 +From 93caf99d2eee8cdfd38b68a0bbfed068de0ad0b8 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Thu, 3 Apr 2014 09:21:51 -0600 Subject: server: Implement socket-specific ioctl() routine. --- - server/sock.c | 26 ++++++++++++++++++++++---- - 1 file changed, 22 insertions(+), 4 deletions(-) + server/sock.c | 27 +++++++++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/server/sock.c b/server/sock.c -index 5ffb1fe..3eb1bdf 100644 +index 4adad0f..d12ad6d 100644 --- a/server/sock.c +++ b/server/sock.c -@@ -49,6 +49,8 @@ +@@ -52,6 +52,9 @@ #include "windef.h" #include "winternl.h" #include "winerror.h" ++#include "wtypes.h" +#define USE_WS_PREFIX +#include "winsock2.h" #include "process.h" #include "file.h" -@@ -83,9 +85,6 @@ +@@ -86,9 +89,6 @@ #define FD_WINE_RAW 0x80000000 #define FD_WINE_INTERNAL 0xFFFF0000 @@ -30,7 +31,7 @@ index 5ffb1fe..3eb1bdf 100644 struct sock { struct object obj; /* object header */ -@@ -117,6 +116,8 @@ static void sock_destroy( struct object *obj ); +@@ -120,6 +120,8 @@ static void sock_destroy( struct object *obj ); static int sock_get_poll_events( struct fd *fd ); static void sock_poll_event( struct fd *fd, int event ); static enum server_fd_type sock_get_fd_type( struct fd *fd ); @@ -39,7 +40,7 @@ index 5ffb1fe..3eb1bdf 100644 static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); static void sock_reselect_async( struct fd *fd, struct async_queue *queue ); static void sock_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ); -@@ -151,7 +152,7 @@ static const struct fd_ops sock_fd_ops = +@@ -154,7 +156,7 @@ static const struct fd_ops sock_fd_ops = sock_poll_event, /* poll_event */ no_flush, /* flush */ sock_get_fd_type, /* get_fd_type */ @@ -48,7 +49,7 @@ index 5ffb1fe..3eb1bdf 100644 sock_queue_async, /* queue_async */ sock_reselect_async, /* reselect_async */ sock_cancel_async /* cancel_async */ -@@ -518,6 +519,23 @@ static enum server_fd_type sock_get_fd_type( struct fd *fd ) +@@ -521,6 +523,23 @@ static enum server_fd_type sock_get_fd_type( struct fd *fd ) return FD_TYPE_SOCKET; }