--
Best regards,
LIU Hao
From 5f09ab25221dd8ad8459bc560168ce83c70f93c1 Mon Sep 17 00:00:00 2001
From: LIU Hao <[email protected]>
Date: Sat, 23 Jul 2022 22:09:21 +0800
Subject: [PATCH] include/ws2tcpip: Rectify `addrinfoexA` and `addrinfoexW`

We should use the same identifiers as in Windows SDK, where the `ex` is
spelled in lowercase. The macro `addrinfoEx` doesn't exist there; although
I am not sure why it was added, it can't match the struct tag anyway, so
remove it.


Reported-by: https://github.com/mingw-w64/mingw-w64/issues/9
Signed-off-by: LIU Hao <[email protected]>
---
 mingw-w64-headers/include/ws2tcpip.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mingw-w64-headers/include/ws2tcpip.h 
b/mingw-w64-headers/include/ws2tcpip.h
index 0a7890bb3..bfed6aef3 100644
--- a/mingw-w64-headers/include/ws2tcpip.h
+++ b/mingw-w64-headers/include/ws2tcpip.h
@@ -265,12 +265,11 @@ WCHAR *gai_strerrorW(int);
 #include <mstcpip.h>
 
 #if (_WIN32_WINNT >= 0x0600)
-#define addrinfoEx __MINGW_NAME_AW(addrinfoEx)
 #define PADDRINFOEX __MINGW_NAME_AW(PADDRINFOEX)
 #define GetAddrInfoEx __MINGW_NAME_AW(GetAddrInfoEx)
 #define SetAddrInfoEx __MINGW_NAME_AW(SetAddrInfoEx)
 
-  typedef struct addrinfoExA {
+  typedef struct addrinfoexA {
     int                ai_flags;
     int                ai_family;
     int                ai_socktype;
@@ -284,7 +283,7 @@ WCHAR *gai_strerrorW(int);
     struct addrinfoexA *ai_next;
   } ADDRINFOEXA, *PADDRINFOEXA;
 
-  typedef struct addrinfoExW {
+  typedef struct addrinfoexW {
     int                ai_flags;
     int                ai_family;
     int                ai_socktype;
-- 
2.37.1

Attachment: OpenPGP_signature
Description: OpenPGP digital signature

_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to