suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows with MinGW: Fix network address resolution

Browse Source 
Use the same code as for MSVC compilation, which is as simple
as defining `HAVE_GETADDRINFO`.

Closes PR 15192
This commit is contained in:
Matthew Flatt 2015-11-29 17:30:33 -07:00
parent e7e75c2292
commit 817fdad2d5
1 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
racket/src/racket/src/network.c
View File

@ -398,6 +398,12 @@ SHARED_OK static struct protoent *proto;
/* mz_addrinfo is defined in scheme.h */ /* mz_addrinfo is defined in scheme.h */
#if defined(__MINGW32__) && !defined(HAVE_GETADDRINFO)
/* Although `configure` didn't discover it, we do have getaddrinfo()
from Winsock */
# define HAVE_GETADDRINFO
#endif
#ifdef HAVE_GETADDRINFO #ifdef HAVE_GETADDRINFO
# define mzAI_PASSIVE AI_PASSIVE # define mzAI_PASSIVE AI_PASSIVE
# define mz_getaddrinfo getaddrinfo # define mz_getaddrinfo getaddrinfo
@ -411,24 +417,6 @@ static int mz_getaddrinfo(const char *nodename, const char *servname,
{ {
struct hostent *h; struct hostent *h;
#ifdef __MINGW32__
{
HMODULE hm;
hm = LoadLibrary("ws2_32.dll");
if (hm) {
gai_t gai;
gai = (gai_t)GetProcAddress(hm, "getaddrinfo");
if (gai) {
int v;
v = gai(nodename, servname, hints, res);
if (!v && !(*res)->ai_addr)
(*res)->ai_addrlen = 0;
return v;
}
}
}
#endif
if (nodename) if (nodename)
h = gethostbyname(nodename); h = gethostbyname(nodename);
else else
@ -471,32 +459,13 @@ static int mz_getaddrinfo(const char *nodename, const char *servname,
void mz_freeaddrinfo(struct mz_addrinfo *ai) void mz_freeaddrinfo(struct mz_addrinfo *ai)
XFORM_SKIP_PROC XFORM_SKIP_PROC
{ {
#ifdef __MINGW32__
{
HMODULE hm;
hm = LoadLibrary("ws2_32.dll");
if (hm) {
fai_t fai;
fai = (fai_t)GetProcAddress(hm, "freeaddrinfo");
if (fai) {
fai(ai);
return;
}
}
}
#endif
free(ai->ai_addr); free(ai->ai_addr);
free(ai); free(ai);
} }
const char *mz_gai_strerror(int ecode) const char *mz_gai_strerror(int ecode)
XFORM_SKIP_PROC XFORM_SKIP_PROC
{ {
#ifdef __MINGW32__
return NULL; /* => use FormatMessageW(), instead */
#else
return hstrerror(ecode); return hstrerror(ecode);
#endif
} }
#endif #endif