From: Sascha Wildner Date: Wed, 27 Feb 2013 19:13:21 +0000 (+0100) Subject: kernel: Fix -Wundef in a number of places. X-Git-Tag: v3.4.0rc~190 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/1e323578b704df82b1fe4264f1d038e75afa275a kernel: Fix -Wundef in a number of places. --- diff --git a/sys/dev/disk/nata/atapi-cd.c b/sys/dev/disk/nata/atapi-cd.c index dc054195fb..037baf0c89 100644 --- a/sys/dev/disk/nata/atapi-cd.c +++ b/sys/dev/disk/nata/atapi-cd.c @@ -480,7 +480,7 @@ acd_ioctl(struct dev_ioctl_args *ap) break; /* XXX TGEN Remove this and the rest of the nocopyout logic? */ -#if __FreeBSD_version > 600008 +#if 0 /* __FreeBSD_version > 600008 */ case CDIOCREADSUBCHANNEL_SYSSPACE: nocopyout = 1; /* FALLTHROUGH */ diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index bc2c35a7a1..f144d8240f 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -100,7 +100,7 @@ #include #include #include -#if defined(__FreeBSD__) || (__NetBSD__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) #include #elif defined(__OpenBSD__) #include @@ -1616,7 +1616,7 @@ sctp_inpcb_alloc(struct socket *so) m->store_at = SCTP_SIGNATURE_SIZE; #if (defined(__FreeBSD__) && (__FreeBSD_version < 500000)) || defined(__DragonFly__) read_random_unlimited(m->random_numbers, sizeof(m->random_numbers)); -#elif defined(__APPLE__) || (__FreeBSD_version > 500000) +#elif defined(__APPLE__) || (defined(__FreeBSD__) && (__FreeBSD_version > 500000)) read_random(m->random_numbers, sizeof(m->random_numbers)); #elif defined(__OpenBSD__) get_random_bytes(m->random_numbers, sizeof(m->random_numbers)); diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index a6bd7806a5..51dc60ae79 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -1,5 +1,4 @@ /* $KAME: sctp_pcb.h,v 1.19 2004/08/17 06:28:02 t-momose Exp $ */ -/* $DragonFly: src/sys/netinet/sctp_pcb.h,v 1.3 2006/05/20 02:42:12 dillon Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc. @@ -164,7 +163,7 @@ struct sctp_epinfo { /* ep zone info */ #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__) -#if __FreeBSD_version >= 500000 +#if defined(__FreeBSD__) && __FreeBSD_version >= 500000 struct uma_zone *ipi_zone_ep; struct uma_zone *ipi_zone_asoc; struct uma_zone *ipi_zone_laddr; diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 539be7a4bf..436ff4aa2f 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -538,7 +538,7 @@ sctp_getcred(SYSCTL_HANDLER_ARGS) struct sctp_tcb *stcb; int error; -#if __FreeBSD_version >= 500000 || defined(__DragonFly__) +#if (defined(__FreeBSD__) && __FreeBSD_version >= 500000) || defined(__DragonFly__) error = priv_check(req->td, PRIV_ROOT); #else error = suser(req->p); @@ -4386,7 +4386,7 @@ sctp_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, #endif /* #if defined(__NetBSD__) || defined(__OpenBSD__) */ -#if __OpenBSD__ +#if defined(__OpenBSD__) /* * Sysctl for sctp variables. */ @@ -4487,7 +4487,7 @@ sysctl_int(); /* NOTREACHED */ } #endif -#if __NetBSD__ +#if defined(__NetBSD__) /* * Sysctl for sctp variables. */ diff --git a/sys/netinet/sctputil.h b/sys/netinet/sctputil.h index a73b40c817..38f4619d58 100644 --- a/sys/netinet/sctputil.h +++ b/sys/netinet/sctputil.h @@ -65,7 +65,7 @@ struct mbuf *sctp_m_copym(struct mbuf *m, int off, int len, int wait); * number = number of elements in zone/pool */ #if defined(__FreeBSD__) || defined(__DragonFly__) -#if __FreeBSD_version >= 500000 +#if defined(__FreeBSD__) && __FreeBSD_version >= 500000 #include #endif #elif defined(__NetBSD__) || defined(__OpenBSD__) @@ -74,7 +74,7 @@ struct mbuf *sctp_m_copym(struct mbuf *m, int off, int len, int wait); /* SCTP_ZONE_INIT: initialize the zone */ #if defined(__FreeBSD__) || defined(__DragonFly__) -#if __FreeBSD_version >= 500000 +#if defined(__FreeBSD__) && __FreeBSD_version >= 500000 #define UMA_ZFLAG_FULL 0x0020 #define SCTP_ZONE_INIT(zone, name, size, number) { \ zone = uma_zcreate(name, size, NULL, NULL, NULL, NULL, UMA_ALIGN_PTR,\ diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index 6e7c6be756..3a5ff75074 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -418,7 +418,7 @@ sctp_skip_csum: #if (defined(SCTP_BASE_FREEBSD) && __FreeBSD_version < 501113) || \ defined(__APPLE__) || defined(__DragonFly__) ip6_savecontrol(in6p_ip, &opts, ip6, m); -#elif __FreeBSD_version >= 440000 || (defined(SCTP_BASE_FREEBSD) && __FreeBSD_version >= 501113) +#elif defined(__FreeBSD__) && (__FreeBSD_version >= 440000 || (defined(SCTP_BASE_FREEBSD) && __FreeBSD_version >= 501113)) ip6_savecontrol(in6p_ip, m, &opts); #else ip6_savecontrol(in6p_ip, m, &opts, NULL); diff --git a/sys/netinet6/sctp6_var.h b/sys/netinet6/sctp6_var.h index 219a29587f..aae97cdb18 100644 --- a/sys/netinet6/sctp6_var.h +++ b/sys/netinet6/sctp6_var.h @@ -1,5 +1,4 @@ /* $KAME: sctp6_var.h,v 1.6 2003/11/25 06:40:55 ono Exp $ */ -/* $DragonFly: src/sys/netinet6/sctp6_var.h,v 1.4 2006/05/20 02:42:12 dillon Exp $ */ /* * Copyright (c) 2001, 2002, 2004 Cisco Systems, Inc. @@ -50,7 +49,7 @@ struct socket; struct sockopt; struct sctp_inpcb; -#if defined(__FreeBSD__) || (__APPLE__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__) SYSCTL_DECL(_net_inet6_sctp6); extern struct pr_usrreqs sctp6_usrreqs; int sctp6_ctloutput(struct socket *, struct sockopt *);