[svn] Don't compile socket_has_inet6 if IPv6 is disabled.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6b39e88fff2158e0702a55abec04c8cbef1ecb90..b281c307ed6f7366529e52155cc3677baeff3a47 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-19  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * connect.c (socket_has_inet6): Only compile it if IPv6 is enabled
+       and AI_ADDRCONFIG is missing.
+
 2003-11-18  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * gen_sslfunc.c (ssl_init_prng): Warn the user when using a weak

diff --git a/src/connect.c b/src/connect.c
index 5557ad39d4c2c1f07ac20507e9731bf89814f861..35e4cfdc097e7f9abb18e48a8a4fc8a55d72934e 100644 (file)
--- a/src/connect.c
+++ b/src/connect.c
@@ -588,6 +588,9 @@ retryable_socket_connect_error (int err)
   return 1;
 }
 
+#ifdef ENABLE_IPV6
+# ifndef HAVE_GETADDRINFO_AI_ADDRCONFIG
+
 /* Return non-zero if the INET6 socket family is supported on the
    system.
 
@@ -613,6 +616,9 @@ socket_has_inet6 (void)
   return supported;
 }
 
+# endif/* not HAVE_GETADDRINFO_AI_ADDRCONFIG */
+#endif /* ENABLE_IPV6 */
+
 /* Wait for a single descriptor to become available, timing out after
    MAXTIME seconds.  Returns 1 if FD is available, 0 for timeout and
    -1 for error.  The argument WAIT_FOR can be a combination of