summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordreid <dreid@13f79535-47bb-0310-9956-ffa450edef68>2004-12-10 15:19:19 +0000
committerdreid <dreid@13f79535-47bb-0310-9956-ffa450edef68>2004-12-10 15:19:19 +0000
commit8f4164b8cae37f89799fd0eb1ff2d7604fc37179 (patch)
treeaf40662c436c2aaeb6c535736319822ed4271c2a
parent3354e9961655e69a4eb27b37e5c8f27507c653a1 (diff)
downloadlibapr-8f4164b8cae37f89799fd0eb1ff2d7604fc37179.tar.gz
s/AF_UNSPEC/APR_UNSPEC/
Proposed by: Ingo Weinhold <bonefish at cs dot tu-berlin dot de> Reviewed by: David Reid git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@111511 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--network_io/unix/sockaddr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c
index 593ab9948..5c8b7b047 100644
--- a/network_io/unix/sockaddr.c
+++ b/network_io/unix/sockaddr.c
@@ -293,7 +293,7 @@ static apr_status_t call_resolver(apr_sockaddr_t **sa,
hints.ai_family = family;
hints.ai_socktype = SOCK_STREAM;
#ifdef HAVE_GAI_ADDRCONFIG
- if (family == AF_UNSPEC) {
+ if (family == APR_UNSPEC) {
/* By default, only look up addresses using address types for
* which a local interface is configured, i.e. no IPv6 if no
* IPv6 interfaces configured. */
@@ -335,7 +335,7 @@ static apr_status_t call_resolver(apr_sockaddr_t **sa,
}
error = getaddrinfo(hostname, servname, &hints, &ai_list);
#ifdef HAVE_GAI_ADDRCONFIG
- if (error == EAI_BADFLAGS && family == AF_UNSPEC) {
+ if (error == EAI_BADFLAGS && family == APR_UNSPEC) {
/* Retry with no flags if AI_ADDRCONFIG was rejected. */
hints.ai_flags = 0;
error = getaddrinfo(hostname, servname, &hints, &ai_list);
@@ -367,7 +367,7 @@ static apr_status_t call_resolver(apr_sockaddr_t **sa,
apr_sockaddr_t *new_sa;
/* Ignore anything bogus: getaddrinfo in some old versions of
- * glibc will return AF_UNIX entries for AF_UNSPEC+AI_PASSIVE
+ * glibc will return AF_UNIX entries for APR_UNSPEC+AI_PASSIVE
* lookups. */
if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) {
ai = ai->ai_next;
@@ -543,7 +543,7 @@ APR_DECLARE(apr_status_t) apr_sockaddr_info_get(apr_sockaddr_t **sa,
if ((masked = flags & (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK))) {
if (!hostname ||
- family != AF_UNSPEC ||
+ family != APR_UNSPEC ||
masked == (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK)) {
return APR_EINVAL;
}