aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-02-15 15:04:10 +0100
committerHenrik Nord <[email protected]>2016-02-15 15:04:10 +0100
commit8f178301f36ac2061688c3a9729109326ef84441 (patch)
treec2704e0c937f1701d79e0e3dd318decb7e094fd1
parent84818479ea74a7084169f415b9253aa2ff6af69d (diff)
parentb801a5b7239876742eee47f1d39d95350fdd30d8 (diff)
downloadotp-8f178301f36ac2061688c3a9729109326ef84441.tar.gz
otp-8f178301f36ac2061688c3a9729109326ef84441.tar.bz2
otp-8f178301f36ac2061688c3a9729109326ef84441.zip
Merge branch 'tuncer/ei-breakage' into maint
* tuncer/ei-breakage: ei: fix breakage reported by Sergei Golovan Revert "musl: fix gethostbyname_r/gethostbyaddr_ selection" OTP-13328
-rw-r--r--lib/erl_interface/src/connect/ei_resolve.c14
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);