Alexandre Julliard : include: Make socklen_t a define to avoid conflicting typedefs.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Fri Jun 16 13:46:22 2017 +0200

include: Make socklen_t a define to avoid conflicting typedefs.

Signed-off-by: Alexandre Julliard

---

include/ws2tcpip.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h
index 934c727..337383b 100644
--- a/include/ws2tcpip.h
+++ b/include/ws2tcpip.h
@@ -54,7 +54,11 @@ typedef struct WS(addrinfoW)
     struct WS(addrinfoW)*   ai_next;
 } ADDRINFOW, *PADDRINFOW;

-typedef int WS(socklen_t);
+#ifdef USE_WS_PREFIX
+typedef int WS_socklen_t;
+#else
+#define socklen_t int  /* avoid conflicts with the system's socklen_t typedef */
+#endif

typedef ADDRINFOA ADDRINFO, *LPADDRINFO;