diff options
| author | Henrik Nord <[email protected]> | 2016-02-15 15:04:47 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2016-02-15 15:04:47 +0100 |
| commit | b82d71be7dc15d9398d3d313989a1fa3de1a56d4 (patch) | |
| tree | bbb326a058e505d7af8f0f8c4a413155414828a2 | |
| parent | 3dc9720902b9911d6fced24b369a6e5b670b87b5 (diff) | |
| parent | 8f178301f36ac2061688c3a9729109326ef84441 (diff) | |
| download | otp-b82d71be7dc15d9398d3d313989a1fa3de1a56d4.tar.gz otp-b82d71be7dc15d9398d3d313989a1fa3de1a56d4.tar.bz2 otp-b82d71be7dc15d9398d3d313989a1fa3de1a56d4.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/erl_interface/src/connect/ei_resolve.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c index 6381b02393..414cb8be3e 100644 --- a/lib/erl_interface/src/connect/ei_resolve.c +++ b/lib/erl_interface/src/connect/ei_resolve.c @@ -601,16 +601,6 @@ struct hostent *ei_gethostbyaddr(const char *addr, int len, int type) return gethostbyaddr(addr, len, type); } -/* - * Imprecise way to select the actually available gethostbyname_r and - * gethostbyaddr_r. - * - * TODO: check this properly in configure.in - */ -#if (defined(__linux__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__)) - #define HAVE_GETHOSTBYADDR_R_8 1 -#endif - struct hostent *ei_gethostbyaddr_r(const char *addr, int length, int type, @@ -626,7 +616,7 @@ struct hostent *ei_gethostbyaddr_r(const char *addr, #ifndef HAVE_GETHOSTBYNAME_R return my_gethostbyaddr_r(addr,length,type,hostp,buffer,buflen,h_errnop); #else -#ifdef HAVE_GETHOSTBYADDR_R_8 +#if (defined(__GLIBC__) || defined(__linux__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__)) struct hostent *result; gethostbyaddr_r(addr, length, type, hostp, buffer, buflen, &result, @@ -653,7 +643,7 @@ struct hostent *ei_gethostbyname_r(const char *name, #ifndef HAVE_GETHOSTBYNAME_R return my_gethostbyname_r(name,hostp,buffer,buflen,h_errnop); #else -#ifdef HAVE_GETHOSTBYADDR_R_8 +#if (defined(__GLIBC__) || defined(__linux__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__)) struct hostent *result; gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop); |