You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by sf...@apache.org on 2012/05/28 15:22:11 UTC
svn commit: r1343245 - in /apr/apr/branches/1.4.x: ./
network_io/unix/sockaddr.c
Author: sf
Date: Mon May 28 13:22:10 2012
New Revision: 1343245
URL: http://svn.apache.org/viewvc?rev=1343245&view=rev
Log:
Merge r1343243:
Guard against EAI_ADDRFAMILY not being defined, it seems to be glibc
specific
Modified:
apr/apr/branches/1.4.x/ (props changed)
apr/apr/branches/1.4.x/network_io/unix/sockaddr.c
Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1343243
Modified: apr/apr/branches/1.4.x/network_io/unix/sockaddr.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/network_io/unix/sockaddr.c?rev=1343245&r1=1343244&r2=1343245&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/network_io/unix/sockaddr.c (original)
+++ apr/apr/branches/1.4.x/network_io/unix/sockaddr.c Mon May 28 13:22:10 2012
@@ -372,7 +372,10 @@ static apr_status_t call_resolver(apr_so
* 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);
}