From cef7b6a9c1b3663b47917affb5445fbc62093e8c Mon Sep 17 00:00:00 2001 From: Robert Patterson Date: Mon, 11 Oct 2021 09:30:14 -0500 Subject: [PATCH] Implement GAI_STRERROR macro to deal with Windows vs. Non-Windows compiles for 64-bit. --- src/inet.c | 4 ++-- src/socket.h | 2 ++ src/udp.c | 4 ++-- src/wsocket.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) mode change 100644 => 100755 src/socket.h diff --git a/src/inet.c b/src/inet.c index b36ea21..483cd01 100755 --- a/src/inet.c +++ b/src/inet.c @@ -253,7 +253,7 @@ int inet_meth_getpeername(lua_State *L, p_socket ps, int family) port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV); if (err) { lua_pushnil(L); - lua_pushstring(L, gai_strerrorA(err)); + lua_pushstring(L, GAI_STRERROR(err)); return 2; } lua_pushstring(L, name); @@ -286,7 +286,7 @@ int inet_meth_getsockname(lua_State *L, p_socket ps, int family) name, INET6_ADDRSTRLEN, port, 6, NI_NUMERICHOST | NI_NUMERICSERV); if (err) { lua_pushnil(L); - lua_pushstring(L, gai_strerrorA(err)); + lua_pushstring(L, GAI_STRERROR(err)); return 2; } lua_pushstring(L, name); diff --git a/src/socket.h b/src/socket.h old mode 100644 new mode 100755 index e541f27..5116b5e --- a/src/socket.h +++ b/src/socket.h @@ -16,8 +16,10 @@ \*=========================================================================*/ #ifdef _WIN32 #include "wsocket.h" +#define GAI_STRERROR gai_strerrorA #else #include "usocket.h" +#define GAI_STRERROR gai_strerror #endif /*=========================================================================*\ diff --git a/src/udp.c b/src/udp.c index 9a69f29..aac41d1 100755 --- a/src/udp.c +++ b/src/udp.c @@ -191,7 +191,7 @@ static int meth_sendto(lua_State *L) { err = getaddrinfo(ip, port, &aihint, &ai); if (err) { lua_pushnil(L); - lua_pushstring(L, gai_strerrorA(err)); + lua_pushstring(L, GAI_STRERROR(err)); return 2; } @@ -290,7 +290,7 @@ static int meth_receivefrom(lua_State *L) { INET6_ADDRSTRLEN, portstr, 6, NI_NUMERICHOST | NI_NUMERICSERV); if (err) { lua_pushnil(L); - lua_pushstring(L, gai_strerrorA(err)); + lua_pushstring(L, GAI_STRERROR(err)); if (wanted > sizeof(buf)) free(dgram); return 2; } diff --git a/src/wsocket.c b/src/wsocket.c index f62f5fb..083845a 100755 --- a/src/wsocket.c +++ b/src/wsocket.c @@ -429,6 +429,6 @@ const char *socket_gaistrerror(int err) { #ifdef EAI_SYSTEM case EAI_SYSTEM: return strerror(errno); #endif - default: return gai_strerrorA(err); + default: return GAI_STRERROR(err); } }