Hans Leidekker : include: Use WS_ prefix with struct timeval.
Alexandre Julliard
julliard at winehq.org
Wed Jun 26 16:15:41 CDT 2019
Module: wine
Branch: master
Commit: 943d91c8b50944a50e00ea161a047c56ad9792bb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=943d91c8b50944a50e00ea161a047c56ad9792bb
Author: Hans Leidekker <hans at codeweavers.com>
Date: Wed Jun 26 18:26:45 2019 +0200
include: Use WS_ prefix with struct timeval.
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ws2_32/socket.c | 2 +-
include/ws2tcpip.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index a302612..3b78f0d 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -7098,7 +7098,7 @@ end:
* GetAddrInfoExW (WS2_32.@)
*/
int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namespace, GUID *namespace_id,
- const ADDRINFOEXW *hints, ADDRINFOEXW **result, struct timeval *timeout, OVERLAPPED *overlapped,
+ const ADDRINFOEXW *hints, ADDRINFOEXW **result, struct WS_timeval *timeout, OVERLAPPED *overlapped,
LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle)
{
int ret;
diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h
index f12deec..ea19ee3 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*);
More information about the wine-cvs
mailing list