[src/trunk]: src/external/bsd/ntp/dist make ntp compile for MKINET6=no

[kardel <kardel%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/df03814d4e0b
branches:  trunk
changeset: 760621:df03814d4e0b
user:      kardel <kardel%NetBSD.org@localhost>
date:      Sun Jan 09 14:49:39 2011 +0000

description:
make ntp compile for MKINET6=no

diffstat:

 external/bsd/ntp/dist/lib/isc/unix/net.c |  6 +++---
 external/bsd/ntp/dist/ntpd/ntp_io.c      |  9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (69 lines):

diff -r 1399368fb44e -r df03814d4e0b external/bsd/ntp/dist/lib/isc/unix/net.c
--- a/external/bsd/ntp/dist/lib/isc/unix/net.c  Sun Jan 09 14:30:36 2011 +0000
+++ b/external/bsd/ntp/dist/lib/isc/unix/net.c  Sun Jan 09 14:49:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.1.1.1 2009/12/13 16:54:38 kardel Exp $       */
+/*     $NetBSD: net.c,v 1.2 2011/01/09 14:49:39 kardel Exp $   */
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
@@ -106,11 +106,11 @@
 
 # if defined(WANT_IPV6)
 static isc_once_t      once_ipv6only = ISC_ONCE_INIT;
-# endif
 
 # if defined(ISC_PLATFORM_HAVEIN6PKTINFO)
 static isc_once_t      once_ipv6pktinfo = ISC_ONCE_INIT;
 # endif
+# endif
 #endif /* ISC_PLATFORM_HAVEIPV6 */
 
 static isc_once_t      once = ISC_ONCE_INIT;
@@ -319,7 +319,6 @@
        RUNTIME_CHECK(isc_once_do(&once_ipv6only,
                                  try_ipv6only) == ISC_R_SUCCESS);
 }
-#endif /* WANT_IPV6 */
 
 #ifdef ISC_PLATFORM_HAVEIN6PKTINFO
 static void
@@ -376,6 +375,7 @@
 }
 #endif /* ISC_PLATFORM_HAVEIN6PKTINFO */
 #endif /* ISC_PLATFORM_HAVEIPV6 */
+#endif /* WANT_IPV6 */
 
 isc_result_t
 isc_net_probe_ipv6only(void) {
diff -r 1399368fb44e -r df03814d4e0b external/bsd/ntp/dist/ntpd/ntp_io.c
--- a/external/bsd/ntp/dist/ntpd/ntp_io.c       Sun Jan 09 14:30:36 2011 +0000
+++ b/external/bsd/ntp/dist/ntpd/ntp_io.c       Sun Jan 09 14:49:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_io.c,v 1.4 2010/12/04 23:08:35 christos Exp $      */
+/*     $NetBSD: ntp_io.c,v 1.5 2011/01/09 14:49:40 kardel Exp $        */
 
 /*
  * ntp_io.c - input/output routines for ntpd.  The socket-opening code
@@ -923,7 +923,10 @@
        u_short port
        )
 {
-       int                     v4wild, v6wild;
+       int                     v4wild;
+#ifdef INCLUDE_IPV6_SUPPORT
+       int                     v6wild;
+#endif
        sockaddr_u              wildaddr;
        isc_netaddr_t           wnaddr;
        nic_rule_action         action;
@@ -2902,7 +2905,9 @@
                 */
                int     rtc;
                u_char  cttl;
+#ifdef INCLUDE_IPV6_SUPPORT
                u_int   uttl;
+#endif
                
                switch (AF(&inter->sin)) {