svn commit: r746117 - in /apr/apr/branches/1.4.x: CHANGES network_io/unix/sockaddr.c

[bo...@apache.org]

Author: bojan
Date: Fri Feb 20 02:30:56 2009
New Revision: 746117

URL: http://svn.apache.org/viewvc?rev=746117&view=rev
Log:
Backport r746115 from the trunk.
Fix compilation error on systems that do not have IPV6.
Patch by Julien Charbon <jch 4js.com>.
PR 46601.

Modified:
    apr/apr/branches/1.4.x/CHANGES
    apr/apr/branches/1.4.x/network_io/unix/sockaddr.c

Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=746117&r1=746116&r2=746117&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Fri Feb 20 02:30:56 2009
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.4.0
 
+  *) Fix compilation error on systems that do not have IPV6.
+     PR 46601 [Julien Charbon <jch 4js.com>]
+
   *) apr_pollset_wakeup() on Windows: Fix core caused by closing the
      file_socket_pipe with standard file_close. 
      [Arsen Chaloyan, Mladen Turk]

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=746117&r1=746116&r2=746117&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 Fri Feb 20 02:30:56 2009
@@ -380,7 +380,11 @@
         /* Ignore anything bogus: getaddrinfo in some old versions of
          * glibc will return AF_UNIX entries for APR_UNSPEC+AI_PASSIVE
          * lookups. */
+#if APR_HAVE_IPV6
         if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) {
+#else
+        if (ai->ai_family != AF_INET) {
+#endif
             ai = ai->ai_next;
             continue;
         }