From e95d4bbfd1245f9c8ef4c34de1468097a24eb147 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Wed, 27 Jul 2022 09:47:49 +0300 Subject: [PATCH] Use different name not just different case for macro wrapping function --- src/inet.c | 4 ++-- src/socket.h | 4 ++-- src/udp.c | 4 ++-- src/usocket.c | 2 +- src/wsocket.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/inet.c b/src/inet.c index 483cd01..138c9ab 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_STRERROR(err)); + lua_pushstring(L, LUA_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_STRERROR(err)); + lua_pushstring(L, LUA_GAI_STRERROR(err)); return 2; } lua_pushstring(L, name); diff --git a/src/socket.h b/src/socket.h index 5116b5e..2555bab 100755 --- a/src/socket.h +++ b/src/socket.h @@ -16,10 +16,10 @@ \*=========================================================================*/ #ifdef _WIN32 #include "wsocket.h" -#define GAI_STRERROR gai_strerrorA +#define LUA_GAI_STRERROR gai_strerrorA #else #include "usocket.h" -#define GAI_STRERROR gai_strerror +#define LUA_GAI_STRERROR gai_strerror #endif /*=========================================================================*\ diff --git a/src/udp.c b/src/udp.c index aac41d1..712ad50 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_STRERROR(err)); + lua_pushstring(L, LUA_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_STRERROR(err)); + lua_pushstring(L, LUA_GAI_STRERROR(err)); if (wanted > sizeof(buf)) free(dgram); return 2; } diff --git a/src/usocket.c b/src/usocket.c index afa6644..69635da 100644 --- a/src/usocket.c +++ b/src/usocket.c @@ -449,6 +449,6 @@ const char *socket_gaistrerror(int err) { case EAI_SERVICE: return PIE_SERVICE; case EAI_SOCKTYPE: return PIE_SOCKTYPE; case EAI_SYSTEM: return strerror(errno); - default: return GAI_STRERROR(err); + default: return LUA_GAI_STRERROR(err); } } diff --git a/src/wsocket.c b/src/wsocket.c index f79aa93..6cb1e41 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_STRERROR(err); + default: return LUA_GAI_STRERROR(err); } }