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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 266811b88e9108fe3dd3c727f931e6ee780c5d9e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=266811b88e9108fe3dd3c727f9...

Author: Bruno Jesus 
Date:   Sat Sep 28 11:58:04 2013 -0300

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

---

include/mswsock.h  |    9 ---------
 include/winsock2.h |    6 ------
 include/ws2def.h   |   15 +++++++++++++++
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/mswsock.h b/include/mswsock.h
index 610dd2c..3e41345 100644
--- a/include/mswsock.h
+++ b/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;
diff --git a/include/winsock2.h b/include/winsock2.h
index 7516d25..c4e013b 100644
--- a/include/winsock2.h
+++ b/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
diff --git a/include/ws2def.h b/include/ws2def.h
index ac68e2b..6255c68 100644
--- a/include/ws2def.h
+++ b/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()
  */