summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-08-01 17:27:09 +0000
committerJoshua Colp <jcolp@digium.com>2007-08-01 17:27:09 +0000
commitd51079b70aa2b166db035a1c93ddcb7f9d21719f (patch)
tree9a7a4dc2a09f2799f149891b9d1842f709aac968 /main
parent4e0947c5f1f9c9583bff9f2be1b0c2810263e3e9 (diff)
Merged revisions 77863 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r77863 | file | 2007-08-01 14:22:35 -0300 (Wed, 01 Aug 2007) | 2 lines Extend autoconf logic to determine which version of gethostbyname_r is on the system. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/utils.c b/main/utils.c
index 1d73e0612..098edc172 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -72,7 +72,7 @@ static char b2a[256];
AST_THREADSTORAGE(inet_ntoa_buf);
-#if !defined(HAVE_GETHOSTBYNAME_R)
+#if !defined(HAVE_GETHOSTBYNAME_R_5) && !defined(HAVE_GETHOSTBYNAME_R_6)
#define ERANGE 34 /*!< duh? ERANGE value copied from web... */
#undef gethostbyname
@@ -217,7 +217,7 @@ struct hostent *ast_gethostbyname(const char *host, struct ast_hostent *hp)
return NULL;
}
-#ifdef SOLARIS
+#ifdef HAVE_GETHOSTBYNAME_R5
result = gethostbyname_r(host, &hp->hp, hp->buf, sizeof(hp->buf), &herrno);
if (!result || !hp->hp.h_addr_list || !hp->hp.h_addr_list[0])