summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsf <sf@13f79535-47bb-0310-9956-ffa450edef68>2012-05-28 13:22:10 +0000
committersf <sf@13f79535-47bb-0310-9956-ffa450edef68>2012-05-28 13:22:10 +0000
commit7044153fcec39a98ebc3f6d10b2ca857d490a1af (patch)
tree5374f7c737aa5ab7e1ec430ae6a72f3f3eb72eda
parent1b8a85c73485ba0746d2693f7ecf371c19a8f1c2 (diff)
downloadlibapr-7044153fcec39a98ebc3f6d10b2ca857d490a1af.tar.gz
Merge r1343243:
Guard against EAI_ADDRFAMILY not being defined, it seems to be glibc specific git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@1343245 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--network_io/unix/sockaddr.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c
index e9cfbd7ed..82de83769 100644
--- a/network_io/unix/sockaddr.c
+++ b/network_io/unix/sockaddr.c
@@ -372,7 +372,10 @@ static apr_status_t call_resolver(apr_sockaddr_t **sa,
* In case of EAI_BADFLAGS, AI_ADDRCONFIG is not supported.
*/
if ((family == APR_UNSPEC) && (error == EAI_BADFLAGS
- || error == EAI_ADDRFAMILY)) {
+#ifdef EAI_ADDRFAMILY
+ || error == EAI_ADDRFAMILY
+#endif
+ )) {
hints.ai_flags &= ~AI_ADDRCONFIG;
error = getaddrinfo(hostname, servname, &hints, &ai_list);
}