include: Move struct WSABUF and WSAMSG to ws2def.h.

include/mswsock.h

@@ -157,15 +157,6 @@ typedef struct _TRANSMIT_PACKETS_ELEMENT {
     } DUMMYUNIONNAME;
 } TRANSMIT_PACKETS_ELEMENT, *PTRANSMIT_PACKETS_ELEMENT, *LPTRANSMIT_PACKETS_ELEMENT;
 
-typedef struct _WSAMSG {
-    LPSOCKADDR  name;
-    INT         namelen;
-    LPWSABUF    lpBuffers;
-    DWORD       dwBufferCount;
-    WSABUF      Control;
-    DWORD       dwFlags;
-} WSAMSG, *PWSAMSG, *LPWSAMSG;
-
 typedef struct _WSACMSGHDR {
     SIZE_T      cmsg_len;
     INT         cmsg_level;

include/winsock2.h

@@ -345,12 +345,6 @@ DECL_WINELIB_TYPE_AW(WSASERVICECLASSINFO)
 DECL_WINELIB_TYPE_AW(PWSASERVICECLASSINFO)
 DECL_WINELIB_TYPE_AW(LPWSASERVICECLASSINFO)
 
-typedef struct _WSABUF
-{
-    ULONG len;
-    CHAR* buf;
-} WSABUF, *LPWSABUF;
-
 #define WSAEVENT      HANDLE
 #define LPWSAEVENT    LPHANDLE
 #define WSAOVERLAPPED OVERLAPPED

include/ws2def.h

@@ -78,6 +78,21 @@ typedef enum {
     ScopeLevelGlobal       = 14
 } SCOPE_LEVEL;
 
+typedef struct _WSABUF
+{
+    ULONG len;
+    CHAR* buf;
+} WSABUF, *LPWSABUF;
+
+typedef struct _WSAMSG {
+    LPSOCKADDR  name;
+    INT         namelen;
+    LPWSABUF    lpBuffers;
+    DWORD       dwBufferCount;
+    WSABUF      Control;
+    DWORD       dwFlags;
+} WSAMSG, *PWSAMSG, *LPWSAMSG;
+
 /*
  * Macros for retrieving control message data returned by WSARecvMsg()
  */