[PATCH] include: Define ADDRINFOT explicitly.

Alistair Leslie-Hughes leslie_alistair at hotmail.com
Mon Aug 12 18:24:14 CDT 2019


We cannot use the AW macros since ADDRINFOT doesn't
have a ADDRINFOTW/A structures.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
 include/ws2tcpip.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h
index b26ab2f2a4..1cb0c12fa1 100644
--- a/include/ws2tcpip.h
+++ b/include/ws2tcpip.h
@@ -54,8 +54,17 @@ typedef struct WS(addrinfoW)
     struct WS(addrinfoW)*   ai_next;
 } ADDRINFOW, *PADDRINFOW;
 
-DECL_WINELIB_TYPE_AW(ADDRINFOT)
-DECL_WINELIB_TYPE_AW(PADDRINFOT)
+#ifdef __WINESRC__
+# define ADDRINFOT error "Use ADDRINFOW or ADDRINFOA directly."
+#else
+#ifdef UNICODE
+#  define ADDRINFOT ADDRINFOW
+#  define PADDRINFOT PADDRINFOW
+#else
+#  define ADDRINFOT ADDRINFOA
+#  define PADDRINFOT PADDRINFOA
+#endif
+#endif
 
 #ifdef USE_WS_PREFIX
 typedef int WS_socklen_t;
-- 
2.17.1




More information about the wine-devel mailing list