[PATCH] include: Use WS_ prefix with struct timeval.
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- include/ws2tcpip.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index f12deec83e..ea19ee39ca 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -178,9 +178,9 @@ int WINAPI WS(getaddrinfo)(const char*,const char*,const struct WS(addrinfo)*,s #define GetAddrInfoA WS(getaddrinfo) int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*); #define GetAddrInfo WINELIB_NAME_AW(GetAddrInfo) -int WINAPI GetAddrInfoExA(const char*,const char*,DWORD,GUID*,const ADDRINFOEXA*,ADDRINFOEXA**,struct timeval*, +int WINAPI GetAddrInfoExA(const char*,const char*,DWORD,GUID*,const ADDRINFOEXA*,ADDRINFOEXA**,struct WS(timeval)*, OVERLAPPED*,LPLOOKUPSERVICE_COMPLETION_ROUTINE,HANDLE*); -int WINAPI GetAddrInfoExW(const WCHAR*,const WCHAR*,DWORD,GUID*, const ADDRINFOEXW*,ADDRINFOEXW**,struct timeval*, +int WINAPI GetAddrInfoExW(const WCHAR*,const WCHAR*,DWORD,GUID*, const ADDRINFOEXW*,ADDRINFOEXW**,struct WS(timeval)*, OVERLAPPED*,LPLOOKUPSERVICE_COMPLETION_ROUTINE,HANDLE*); #define GetAddrInfoEx WINELIB_NAME_AW(GetAddrInfoExW) int WINAPI GetAddrInfoExOverlappedResult(OVERLAPPED*); -- 2.11.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=54154 Your paranoid android. === debian9 (build log) === ../../../wine/dlls/ws2_32/socket.c:7100:12: error: conflicting types for ‘GetAddrInfoExW’ Makefile:209: recipe for target 'socket.o' failed Makefile:8436: recipe for target 'dlls/ws2_32' failed Task: The win32 build failed === debian9 (build log) === ../../../wine/dlls/ws2_32/socket.c:7100:12: error: conflicting types for ‘GetAddrInfoExW’ Makefile:208: recipe for target 'socket.o' failed Makefile:8214: recipe for target 'dlls/ws2_32' failed Task: The wow64 build failed
participants (2)
-
Hans Leidekker -
Marvin