diff options
32 files changed, 135 insertions, 128 deletions
diff --git a/sys/coda/coda_psdev.c b/sys/coda/coda_psdev.c index 7e71f1c..56cdbc7 100644 --- a/sys/coda/coda_psdev.c +++ b/sys/coda/coda_psdev.c @@ -570,7 +570,7 @@ coda_call(mntinfo, inSize, outSize, buffer) error, i); #endif -#if notyet +#ifdef notyet tempset = td->td_siglist; SIGSETNAND(tempset, td->td_sigmask); printf("coda_call: siglist = %p, sigmask = %p, mask %p\n", diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c index 1233c6f..29e4aac 100644 --- a/sys/contrib/ipfilter/netinet/fil.c +++ b/sys/contrib/ipfilter/netinet/fil.c @@ -2287,7 +2287,7 @@ int out; } else #endif { -#if (OpenBSD >= 200311) && defined(_KERNEL) +#if (defined(OpenBSD) && OpenBSD >= 200311) && defined(_KERNEL) ip->ip_len = ntohs(ip->ip_len); ip->ip_off = ntohs(ip->ip_off); #endif @@ -2499,7 +2499,7 @@ finished: RWLOCK_EXIT(&ipf_global); #ifdef _KERNEL -# if OpenBSD >= 200311 +# if defined(OpenBSD) && OpenBSD >= 200311 if (FR_ISPASS(pass) && (v == 4)) { ip = fin->fin_ip; ip->ip_len = ntohs(ip->ip_len); diff --git a/sys/contrib/ipfilter/netinet/ip_auth.c b/sys/contrib/ipfilter/netinet/ip_auth.c index bb8705c..a5e5c58 100644 --- a/sys/contrib/ipfilter/netinet/ip_auth.c +++ b/sys/contrib/ipfilter/netinet/ip_auth.c @@ -52,7 +52,8 @@ struct file; # include <sys/stream.h> # include <sys/kmem.h> #endif -#if (_BSDI_VERSION >= 199802) || (__FreeBSD_version >= 400000) +#if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802) || \ + (__FreeBSD_version >= 400000) # include <sys/queue.h> #endif #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi) @@ -510,7 +511,8 @@ fr_authioctlloop: # else /* MENTAT */ # ifdef linux # else -# if (_BSDI_VERSION >= 199802) || defined(__OpenBSD__) || \ +# if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802) || \ + (defined(__OpenBSD__)) || \ (defined(__sgi) && (IRIX >= 60500) || \ (defined(__FreeBSD__) && (__FreeBSD_version >= 470102))) error = ip_output(m, NULL, NULL, IP_FORWARDING, NULL, diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h index 2afa333..1bd24ff 100644 --- a/sys/contrib/ipfilter/netinet/ip_compat.h +++ b/sys/contrib/ipfilter/netinet/ip_compat.h @@ -1,5 +1,3 @@ -/* $FreeBSD$ */ - /* * Copyright (C) 1993-2001, 2003 by Darren Reed. * @@ -37,7 +35,7 @@ #ifndef SOLARIS #define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4))) #endif -#if SOLARIS2 >= 8 +#if defined(SOLARIS2) && SOLARIS2 >= 8 # ifndef USE_INET6 # define USE_INET6 # endif @@ -142,7 +140,7 @@ struct file; # include <sys/ioccom.h> # include <sys/sysmacros.h> # include <sys/kmem.h> -# if SOLARIS2 >= 10 +# if defined(SOLARIS2) && SOLARIS2 >= 10 # include <sys/procset.h> # include <sys/proc.h> # include <sys/devops.h> @@ -156,7 +154,7 @@ struct file; # undef RES_INIT # endif /* _KERNEL */ -# if SOLARIS2 >= 8 +# if defined(SOLARIS2) && SOLARIS2 >= 8 # include <netinet/ip6.h> # include <netinet/icmp6.h> # endif @@ -177,7 +175,7 @@ struct file; # ifndef KERNEL # undef _KERNEL # endif -# if SOLARIS2 >= 8 +# if defined(SOLARIS2) && SOLARIS2 >= 8 # define SNPRINTF snprintf # include <inet/ip_if.h> @@ -192,7 +190,7 @@ struct ip6_ext { }; # endif /* SOLARIS2 >= 8 */ -# if SOLARIS2 >= 6 +# if defined(SOLARIS2) && SOLARIS2 >= 6 # include <sys/atomic.h> typedef uint32_t u_32_t; # else @@ -205,7 +203,7 @@ typedef unsigned int u_32_t; # define KMUTEX_T kmutex_t # include "qif.h" # include "pfil.h" -# if SOLARIS2 >= 6 +# if defined(SOLARIS2) && SOLARIS2 >= 6 # if SOLARIS2 == 6 # define ATOMIC_INCL(x) atomic_add_long((uint32_t*)&(x), 1) # define ATOMIC_DECL(x) atomic_add_long((uint32_t*)&(x), -1) @@ -278,7 +276,7 @@ extern void *get_unit __P((char *, int)); typedef mblk_t mb_t; # endif /* _KERNEL */ -# if (SOLARIS2 >= 7) +# if defined(SOLARIS2) && (SOLARIS2 >= 7) # ifdef lint # define ALIGN32(ptr) (ptr ? 0L : 0L) # define ALIGN16(ptr) (ptr ? 0L : 0L) @@ -288,7 +286,7 @@ typedef mblk_t mb_t; # endif # endif -# if SOLARIS2 < 6 +# if defined(SOLARIS2) && SOLARIS2 < 6 typedef struct uio uio_t; # endif typedef int ioctlcmd_t; @@ -1222,7 +1220,10 @@ typedef u_int32_t u_32_t; * For BSD kernels, if bpf is in the kernel, enable ipfilter to use bpf in * filter rules. */ -#if !defined(IPFILTER_BPF) && ((NBPF > 0) || (NBPFILTER > 0) || (DEV_BPF >0)) +#if !defined(IPFILTER_BPF) && \ + ((defined(NBPF) && NBPF > 0) || \ + (defined(NBPFILTER) && NBPFILTER > 0) || \ + (defined(DEV_BPF) && DEV_BPF >0)) # define IPFILTER_BPF #endif diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/sys/contrib/ipfilter/netinet/ip_fil.h index 5eaab63..eb50a8e 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil.h +++ b/sys/contrib/ipfilter/netinet/ip_fil.h @@ -1,5 +1,3 @@ -/* $FreeBSD$ */ - /* * Copyright (C) 1993-2001, 2003 by Darren Reed. * @@ -1108,7 +1106,7 @@ typedef struct ipftune { #if (defined(NetBSD) && (NetBSD > 199609) && (NetBSD <= 1991011)) || \ (defined(NetBSD1_2) && NetBSD1_2 > 1) || \ (defined(__FreeBSD__) && (__FreeBSD_version >= 500043)) -# if (NetBSD >= 199905) +# if defined(NetBSD) && (NetBSD >= 199905) # define PFIL_HOOKS # endif # ifdef PFIL_HOOKS @@ -1180,9 +1178,11 @@ extern void ipfilter_sgi_intfsync __P((void)); # ifdef IPFILTER_LKM extern int iplidentify __P((char *)); # endif -# if (_BSDI_VERSION >= 199510) || (__FreeBSD_version >= 220000) || \ +# if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199510) || \ + (__FreeBSD_version >= 220000) || \ (NetBSD >= 199511) || defined(__OpenBSD__) -# if defined(__NetBSD__) || (_BSDI_VERSION >= 199701) || \ +# if defined(__NetBSD__) || \ + (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199701) || \ defined(__OpenBSD__) || (__FreeBSD_version >= 300000) # if (__FreeBSD_version >= 500024) # if (__FreeBSD_version >= 502116) diff --git a/sys/contrib/ipfilter/netinet/ip_log.c b/sys/contrib/ipfilter/netinet/ip_log.c index c42ce0a..e42469d 100644 --- a/sys/contrib/ipfilter/netinet/ip_log.c +++ b/sys/contrib/ipfilter/netinet/ip_log.c @@ -62,7 +62,9 @@ struct file; # endif #endif /* _KERNEL */ #if !SOLARIS && !defined(__hpux) && !defined(linux) -# if (NetBSD > 199609) || (OpenBSD > 199603) || (__FreeBSD_version >= 300000) +# if (defined(NetBSD) && NetBSD > 199609) || \ + (defined(OpenBSD) && OpenBSD > 199603) || \ + (__FreeBSD_version >= 300000) # include <sys/dirent.h> # else # include <sys/dir.h> diff --git a/sys/dev/asr/dptsig.h b/sys/dev/asr/dptsig.h index a70ad11..e7b6d7d 100644 --- a/sys/dev/asr/dptsig.h +++ b/sys/dev/asr/dptsig.h @@ -76,7 +76,7 @@ typedef unsigned long sigLONG; #endif /* aix */ #endif /* For the Macintosh */ -#if STRUCTALIGNMENTSUPPORTED +#ifdef STRUCTALIGNMENTSUPPORTED #pragma options align=mac68k #endif @@ -458,7 +458,7 @@ typedef struct dpt_sig_Packed { #endif /* aix */ #endif /* For the Macintosh */ -#if STRUCTALIGNMENTSUPPORTED +#ifdef STRUCTALIGNMENTSUPPORTED #pragma options align=reset #endif diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c index 8882b8b..00526de 100644 --- a/sys/dev/bktr/bktr_card.c +++ b/sys/dev/bktr/bktr_card.c @@ -120,7 +120,7 @@ __FBSDID("$FreeBSD$"); #define PFC8582_WADDR 0xa0 #define PFC8582_RADDR 0xa1 -#if BKTR_SYSTEM_DEFAULT == BROOKTREE_PAL +#if defined(BKTR_SYSTEM_DEFAULT) && BKTR_SYSTEM_DEFAULT == BROOKTREE_PAL #define DEFAULT_TUNER PHILIPS_PALI #else #define DEFAULT_TUNER PHILIPS_NTSC @@ -1196,7 +1196,7 @@ checkTuner: break; case CARD_LEADTEK: -#if BKTR_SYSTEM_DEFAULT == BROOKTREE_PAL +#if defined(BKTR_SYSTEM_DEFAULT) && BKTR_SYSTEM_DEFAULT == BROOKTREE_PAL select_tuner( bktr, PHILIPS_FR1216_PAL ); #else select_tuner( bktr, PHILIPS_FR1236_NTSC ); diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index 41f0b09..9792418 100644 --- a/sys/dev/bktr/bktr_core.c +++ b/sys/dev/bktr/bktr_core.c @@ -981,7 +981,7 @@ video_open( bktr_ptr_t bktr ) OUTB(bktr, BKTR_ADC, SYNC_LEVEL); -#if BKTR_SYSTEM_DEFAULT == BROOKTREE_PAL +#if defined(BKTR_SYSTEM_DEFAULT) && BKTR_SYSTEM_DEFAULT == BROOKTREE_PAL video_format = 0; #else video_format = 1; diff --git a/sys/dev/esp/ncr53c9x.c b/sys/dev/esp/ncr53c9x.c index 010e9c6..c9ac5e8 100644 --- a/sys/dev/esp/ncr53c9x.c +++ b/sys/dev/esp/ncr53c9x.c @@ -2958,7 +2958,7 @@ ncr53c9x_timeout(void *arg) sc->sc_phase, sc->sc_prevphase, (long)sc->sc_dleft, sc->sc_msgpriq, sc->sc_msgout, NCRDMA_ISACTIVE(sc) ? "DMA active" : ""); -#if NCR53C9X_DEBUG > 1 +#if defined(NCR53C9X_DEBUG) && NCR53C9X_DEBUG > 1 printf("TRACE: %s.", ecb->trace); #endif diff --git a/sys/dev/esp/ncr53c9xvar.h b/sys/dev/esp/ncr53c9xvar.h index 79afcee..c9ac4bb 100644 --- a/sys/dev/esp/ncr53c9xvar.h +++ b/sys/dev/esp/ncr53c9xvar.h @@ -142,11 +142,11 @@ struct ncr53c9x_ecb { u_char tag[2]; /* TAG bytes */ u_char pad[1]; -#if NCR53C9X_DEBUG > 1 +#if defined(NCR53C9X_DEBUG) && NCR53C9X_DEBUG > 1 char trace[1000]; #endif }; -#if NCR53C9X_DEBUG > 1 +#if defined(NCR53C9X_DEBUG) && NCR53C9X_DEBUG > 1 #define ECB_TRACE(ecb, msg, a, b) do { \ const char *f = "[" msg "]"; \ int n = strlen((ecb)->trace); \ diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index 0878feb..ea9c996 100644 --- a/sys/dev/fb/fb.c +++ b/sys/dev/fb/fb.c @@ -304,7 +304,7 @@ vid_configure(int flags) #ifdef FB_INSTALL_CDEV -#if experimental +#if 0 /* experimental */ static devclass_t fb_devclass; @@ -348,12 +348,12 @@ fbattach(device_t dev) return 0; } -#endif /* experimental */ +#endif #define FB_UNIT(dev) minor(dev) #define FB_MKMINOR(unit) (u) -#if experimental +#if 0 /* experimental */ static d_open_t fbopen; static d_close_t fbclose; static d_read_t fbread; diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c index 2f2b358..e4dfdfe 100644 --- a/sys/dev/lmc/if_lmc.c +++ b/sys/dev/lmc/if_lmc.c @@ -71,7 +71,7 @@ * * Send bug reports and improvements to <boggs@boggs.palo-alto.ca.us>. */ -#if __FreeBSD__ +#ifdef __FreeBSD__ # include <sys/param.h> /* OS version */ # define IFNET 1 # include "opt_inet.h" /* INET */ @@ -139,7 +139,7 @@ # include <dev/lmc/if_lmc.h> #endif /*__FreeBSD__*/ -#if __NetBSD__ +#ifdef __NetBSD__ # include <sys/param.h> /* OS version */ # define IFNET 1 # include "opt_inet.h" /* INET6, INET */ @@ -188,7 +188,7 @@ # include "if_lmc.h" #endif /*__NetBSD__*/ -#if __OpenBSD__ +#ifdef __OpenBSD__ # include <sys/param.h> /* OS version */ # define IFNET 1 /* -DINET is passed on the compiler command line */ @@ -236,7 +236,7 @@ # include "if_lmc.h" #endif /*__OpenBSD__*/ -#if __bsdi__ +#ifdef __bsdi__ # include <sys/param.h> /* OS version */ # define IFNET 1 /* -DINET is passed on the compiler command line */ @@ -286,7 +286,7 @@ # include "if_lmc.h" #endif /*__bsdi__*/ -#if __linux__ +#ifdef __linux__ # include <linux/config.h> # if (CONFIG_HDLC || CONFIG_HDLC_MODULE) # define GEN_HDLC 1 @@ -2477,8 +2477,8 @@ struct card t1_card = #if IFNET -# if ((__FreeBSD__ && (__FreeBSD_version < 500000)) ||\ - __NetBSD__ || __OpenBSD__ || __bsdi__) +# if ((defined(__FreeBSD__) && (__FreeBSD_version < 500000)) ||\ + defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)) static void netisr_dispatch(int isr, struct mbuf *mbuf) { @@ -2580,7 +2580,7 @@ mbuf_dequeue(struct desc_ring *ring) return m; } -# if __FreeBSD__ +# ifdef __FreeBSD__ static void /* *** FreeBSD ONLY *** Callout from bus_dmamap_load() */ fbsd_dmamap_load(void *arg, bus_dma_segment_t *segs, int nsegs, int error) { @@ -2607,7 +2607,7 @@ create_ring(softc_t *sc, struct desc_ring *ring, int num_descs) return EINVAL; } -#if __FreeBSD__ +#ifdef __FreeBSD__ /* Create a DMA tag for descriptors and buffers. */ if ((error = bus_dma_tag_create(NULL, 4, 0, BUS_SPACE_MAXADDR_32BIT, @@ -2648,7 +2648,7 @@ create_ring(softc_t *sc, struct desc_ring *ring, int num_descs) return error; } -#elif (__NetBSD__ || __OpenBSD__) +#elif (defined(__NetBSD__) || defined(__OpenBSD__)) /* Use the DMA tag passed to attach() for descriptors and buffers. */ ring->tag = sc->pa_dmat; @@ -2697,7 +2697,7 @@ create_ring(softc_t *sc, struct desc_ring *ring, int num_descs) return error; } -#elif __bsdi__ +#elif defined(__bsdi__) /* Allocate wired physical memory for DMA descriptor array. */ if ((ring->first = malloc(size_descs, M_DEVBUF, M_NOWAIT)) == NULL) @@ -2751,7 +2751,7 @@ destroy_ring(softc_t *sc, struct desc_ring *ring) if (ring->read++ == ring->last) ring->read = ring->first; } -#if __FreeBSD__ +#ifdef __FreeBSD__ /* Free the dmamaps of all DMA descriptors. */ for (desc=ring->first; desc!=ring->last+1; desc++) @@ -2768,7 +2768,7 @@ destroy_ring(softc_t *sc, struct desc_ring *ring) if (ring->tag != NULL) bus_dma_tag_destroy(ring->tag); -#elif (__NetBSD__ || __OpenBSD__) +#elif (defined(__NetBSD__) || defined(__OpenBSD__)) /* Free the dmamaps of all DMA descriptors. */ for (desc=ring->first; desc!=ring->last+1; desc++) @@ -2788,7 +2788,7 @@ destroy_ring(softc_t *sc, struct desc_ring *ring) if (ring->segs[0].ds_addr != 0) bus_dmamem_free(ring->tag, ring->segs, ring->nsegs); -#elif __bsdi__ +#elif defined(__bsdi__) /* Free kernel memory for DMA descriptor array. */ if (ring->first != NULL) @@ -2807,7 +2807,7 @@ rxintr_cleanup(softc_t *sc) struct mbuf *new_mbuf; int pkt_len, desc_len; -#if (__FreeBSD__ && DEVICE_POLLING) +#if (defined(__FreeBSD__) && DEVICE_POLLING) /* Input packet flow control (livelock prevention): */ /* Give pkts to higher levels only if quota is > 0. */ if (sc->quota <= 0) return 0; @@ -2923,7 +2923,7 @@ rxintr_cleanup(softc_t *sc) sc->ifp->if_ipackets++; LMC_BPF_MTAP(first_mbuf); #endif -#if (__FreeBSD__ && DEVICE_POLLING) +#if (defined(__FreeBSD__) && DEVICE_POLLING) sc->quota--; #endif @@ -3039,11 +3039,11 @@ rxintr_setup(softc_t *sc) DMA_SYNC(desc->map, desc_len, BUS_DMASYNC_PREREAD); /* Set up the DMA descriptor. */ -#if __FreeBSD__ +#ifdef __FreeBSD__ desc->address1 = ring->segs[0].ds_addr; -#elif (__NetBSD__ || __OpenBSD__) +#elif (defined(__NetBSD__) || defined(__OpenBSD__)) desc->address1 = desc->map->dm_segs[0].ds_addr; -#elif __bsdi__ +#elif defined(__bsdi__) desc->address1 = vtophys(m->m_data); /* Relax! BSD/OS only. */ #endif desc->length1 = desc_len>>1; @@ -3167,12 +3167,12 @@ txintr_setup_mbuf(softc_t *sc, struct mbuf *m) /* Prevent wild fetches if mapping fails (nsegs==0). */ desc->length1 = desc->length2 = 0; desc->address1 = desc->address2 = 0; -#if (__FreeBSD__ || __NetBSD__ || __OpenBSD__) +#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) { -# if __FreeBSD__ +# ifdef __FreeBSD__ bus_dma_segment_t *segs = ring->segs; int nsegs = ring->nsegs; -# elif (__NetBSD__ || __OpenBSD__) +# elif (defined(__NetBSD__) || defined(__OpenBSD__)) bus_dma_segment_t *segs = desc->map->dm_segs; int nsegs = desc->map->dm_nsegs; # endif @@ -3187,7 +3187,7 @@ txintr_setup_mbuf(softc_t *sc, struct mbuf *m) desc->length2 = segs[1].ds_len; } } -#elif __bsdi__ +#elif defined(__bsdi__) desc->address1 = vtophys(data); /* Relax! BSD/OS only. */ desc->length1 = desc_len; #endif @@ -3284,7 +3284,7 @@ txintr_setup(softc_t *sc) #endif /* BSD */ -#if __linux__ +#ifdef __linux__ /* NOTE: this is the LINUX version of the interrupt/DMA code, */ /* Singly-linked tail-queues hold sk_buffs with active DMA. @@ -3947,7 +3947,7 @@ user_interrupt(softc_t *sc, int check_status) #if BSD -# if (__FreeBSD__ && DEVICE_POLLING) +# if (defined(__FreeBSD__) && DEVICE_POLLING) /* Service the card from the kernel idle loop without interrupts. */ static void @@ -3986,7 +3986,7 @@ bsd_interrupt(void *arg) if ((READ_CSR(TLP_STATUS) & TLP_INT_TXRX) == 0) return IRQ_NONE; -# if (__FreeBSD__ && DEVICE_POLLING) +# if (defined(__FreeBSD__) && DEVICE_POLLING) if (sc->ifp->if_capenable & IFCAP_POLLING) return IRQ_NONE; @@ -4066,10 +4066,10 @@ p2p_mdmctl(struct p2pcom *p2p, int flag) static void sppp_tls(struct sppp *sppp) { -# if __FreeBSD__ +# ifdef __FreeBSD__ if (!(sppp->pp_mode & IFF_LINK2) && !(sppp->pp_flags & PP_FR)) -# elif __NetBSD__ || __OpenBSD__ +# elif defined(__NetBSD__) || defined(__OpenBSD__) if (!(sppp->pp_flags & PP_CISCO)) # endif sppp->pp_up(sppp); @@ -4079,10 +4079,10 @@ sppp_tls(struct sppp *sppp) static void sppp_tlf(struct sppp *sppp) { -# if __FreeBSD__ +# ifdef __FreeBSD__ if (!(sppp->pp_mode & IFF_LINK2) && !(sppp->pp_flags & PP_FR)) -# elif __NetBSD__ || __OpenBSD__ +# elif defined(__NetBSD__) || defined(__OpenBSD__) if (!(sppp->pp_flags & PP_CISCO)) # endif sppp->pp_down(sppp); @@ -4178,9 +4178,9 @@ config_proto(softc_t *sc, struct config *config) (config->line_prot == PROT_PPP)) { LMC_BPF_DETACH; -# if (__NetBSD__ || __OpenBSD__) +# if (defined(__NetBSD__) || defined(__OpenBSD__)) sc->sppp->pp_flags &= ~PP_CISCO; -# elif __FreeBSD__ +# elif defined(__FreeBSD__) sc->ifp->if_flags &= ~IFF_LINK2; sc->sppp->pp_flags &= ~PP_FR; # endif @@ -4197,9 +4197,9 @@ config_proto(softc_t *sc, struct config *config) (config->line_prot == PROT_C_HDLC)) { LMC_BPF_DETACH; -# if (__NetBSD__ || __OpenBSD__) +# if (defined(__NetBSD__) || defined(__OpenBSD__)) sc->sppp->pp_flags |= PP_CISCO; -# elif __FreeBSD__ +# elif defined(__FreeBSD__) sc->ifp->if_flags |= IFF_LINK2; sc->sppp->pp_flags &= ~PP_FR; # endif @@ -4212,9 +4212,9 @@ config_proto(softc_t *sc, struct config *config) (config->line_prot == PROT_FRM_RLY)) { LMC_BPF_DETACH; -# if (__NetBSD__ || __OpenBSD__) +# if (defined(__NetBSD__) || defined(__OpenBSD__)) sc->sppp->pp_flags &= ~PP_CISCO; -# elif __FreeBSD__ +# elif defined(__FreeBSD__) sc->ifp->if_flags &= ~IFF_LINK2; sc->sppp->pp_flags |= PP_FR; # endif @@ -4464,7 +4464,7 @@ raw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) switch (cmd) { -# if (__FreeBSD__ && DEVICE_POLLING) /* XXX necessary? */ +# if (defined(__FreeBSD__) && DEVICE_POLLING) /* XXX necessary? */ case SIOCSIFCAP: # endif case SIOCSIFDSTADDR: @@ -4493,7 +4493,7 @@ static int ifnet_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { softc_t *sc = IFP2SC(ifp); -# if __OpenBSD__ +# ifdef __OpenBSD__ struct ifreq *ifr = (struct ifreq *) data; # endif int error = 0; @@ -4509,7 +4509,7 @@ ifnet_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) case LMCIOCTL: error = core_ioctl(sc, cmd, data); break; -# if __OpenBSD__ +# ifdef __OpenBSD__ /* Catch the IOCTLs used by ifconfig. */ case SIOCSIFMEDIA: if ((error = CHECK_CAP)) break; @@ -4687,11 +4687,11 @@ ifnet_watchdog(struct ifnet *ifp) /* Notice change in line protocol. */ sc->status.line_pkg = PKG_SPPP; -# if __FreeBSD__ +# ifdef __FreeBSD__ if (sc->sppp->pp_flags & PP_FR) sc->status.line_prot = PROT_FRM_RLY; else if (sc->ifp->if_flags & IFF_LINK2) -# elif (__NetBSD__ || __OpenBSD__) +# elif (defined(__NetBSD__) || defined(__OpenBSD__)) if (sc->sppp->pp_flags & PP_CISCO) # endif sc->status.line_prot = PROT_C_HDLC; @@ -4714,7 +4714,7 @@ ifnet_watchdog(struct ifnet *ifp) ifp->if_oerrors = cntrs->oerrors; ifp->if_iqdrops = cntrs->idiscards; -# if ((__FreeBSD_version >= 500000) || __OpenBSD__ || __NetBSD__) +# if ((__FreeBSD_version >= 500000) || defined(__OpenBSD__) || defined(__NetBSD__)) if (sc->status.oper_status == STATUS_UP) ifp->if_link_state = LINK_STATE_UP; else @@ -4725,7 +4725,7 @@ ifnet_watchdog(struct ifnet *ifp) ifp->if_timer = 1; } -# if __OpenBSD__ +# ifdef __OpenBSD__ /* Callback from ifmedia. */ static int @@ -4815,7 +4815,7 @@ setup_ifnet(struct ifnet *ifp) ifp->if_mtu = MAX_DESC_LEN; /* sppp & p2p change this */ ifp->if_type = IFT_PTPSERIAL; /* p2p changes this */ -# if (__FreeBSD__ && DEVICE_POLLING) +# if (defined(__FreeBSD__) && DEVICE_POLLING) ifp->if_capabilities |= IFCAP_POLLING; # if (__FreeBSD_version < 500000) ifp->if_capenable |= IFCAP_POLLING; @@ -4823,18 +4823,18 @@ setup_ifnet(struct ifnet *ifp) # endif /* Every OS does it differently! */ -# if (__FreeBSD__ && (__FreeBSD_version < 502000)) +# if (defined(__FreeBSD__) && (__FreeBSD_version < 502000)) (const char *)ifp->if_name = device_get_name(sc->dev); ifp->if_unit = device_get_unit(sc->dev); # elif (__FreeBSD_version >= 502000) ifp->if_dname = device_get_name(sc->dev); ifp->if_dunit = device_get_unit(sc->dev); strlcpy(ifp->if_xname, device_get_nameunit(sc->dev), IFNAMSIZ); -# elif __NetBSD__ +# elif defined(__NetBSD__) strcpy(ifp->if_xname, sc->dev.dv_xname); # elif __OpenBSD__ bcopy(sc->dev.dv_xname, ifp->if_xname, IFNAMSIZ); -# elif __bsdi__ +# elif defined(__bsdi__) ifp->if_name = sc->dev.dv_cfdata->cf_driver->cd_name; ifp->if_unit = sc->dev.dv_unit; # endif @@ -4872,14 +4872,15 @@ ifnet_attach(softc_t *sc) /* Attach to the ifnet kernel interface. */ if_attach(sc->ifp); -# if ((__NetBSD_Version__ >= 106000000) || (OpenBSD >= 200211)) +# if ((defined(__NetBSD__) && __NetBSD_Version__ >= 106000000) || \ + (defined(__OpenBSD__) && OpenBSD >= 200211)) if_alloc_sadl(sc->ifp); # endif /* Attach Berkeley Packet Filter. */ LMC_BPF_ATTACH(DLT_RAW, 0); -# if __OpenBSD__ +# ifdef __OpenBSD__ /* Initialize ifmedia mechanism. */ ifmedia_init(&sc->ifm, IFM_OMASK | IFM_GMASK | IFM_IMASK, ifmedia_change, ifmedia_status); @@ -4911,11 +4912,11 @@ ifnet_attach(softc_t *sc) static void ifnet_detach(softc_t *sc) { -# if __OpenBSD__ +# ifdef __OpenBSD__ ifmedia_delete_instance(&sc->ifm, IFM_INST_ANY); # endif -# if (__FreeBSD__ && DEVICE_POLLING) +# if (defined(__FreeBSD__) && DEVICE_POLLING) if (sc->ifp->if_capenable & IFCAP_POLLING) ether_poll_deregister(sc->ifp); # endif @@ -4923,7 +4924,8 @@ ifnet_detach(softc_t *sc) /* Detach Berkeley Packet Filter. */ LMC_BPF_DETACH; -# if ((__NetBSD_Version__ >= 106000000) || (OpenBSD >= 200211)) +# if ((defined(__NetBSD__) && __NetBSD_Version__ >= 106000000) || \ + (defined(__OpenBSD__) && OpenBSD >= 200211)) if_free_sadl(sc->ifp); # endif @@ -5210,7 +5212,7 @@ struct ng_type ng_type = .findhook = NULL, .connect = ng_connect, .rcvdata = ng_rcvdata, -# if (__FreeBSD__ && (__FreeBSD_version < 500000)) +# if (defined(__FreeBSD__) && (__FreeBSD_version < 500000)) .rcvdataq = ng_rcvdata, # endif .disconnect = ng_disconnect, @@ -5570,7 +5572,7 @@ detach_card(softc_t *sc) /* This is the I/O configuration interface for FreeBSD */ -#if __FreeBSD__ +#ifdef __FreeBSD__ static int fbsd_probe(device_t dev) @@ -5753,7 +5755,7 @@ MODULE_DEPEND(if_lmc, sppp, 1, 1, 1); /* This is the I/O configuration interface for NetBSD. */ -#if __NetBSD__ +#ifdef __NetBSD__ static int nbsd_match(struct device *parent, struct cfdata *match, void *aux) @@ -6045,7 +6047,7 @@ int if_lmc_lkmentry(struct lkm_table *lkmtp, int cmd, int ver) /* This is the I/O configuration interface for OpenBSD. */ -#if __OpenBSD__ +#ifdef __OpenBSD__ static int obsd_match(struct device *parent, void *match, void *aux) @@ -6295,7 +6297,7 @@ int if_lmc_lkmentry(struct lkm_table *lkmtp, int cmd, int ver) /* This is the I/O configuration interface for BSD/OS. */ -#if __bsdi__ +#ifdef __bsdi__ static int bsdi_match(pci_devaddr_t *pa) @@ -6412,7 +6414,7 @@ struct cfdriver lmccd = }; #endif /* __bsdi__ */ -#if __linux__ +#ifdef __linux__ /* The kernel calls this procedure when an interrupt happens. */ static irqreturn_t diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c index ec51575..8d89e08 100644 --- a/sys/dev/my/if_my.c +++ b/sys/dev/my/if_my.c @@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$"); static int MY_USEIOSPACE = 1; -#if (MY_USEIOSPACE) +#ifdef MY_USEIOSPACE #define MY_RES SYS_RES_IOPORT #define MY_RID MY_PCI_LOIO #else diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c index 04ce4c6..f2433b2 100644 --- a/sys/dev/rp/rp.c +++ b/sys/dev/rp/rp.c @@ -813,7 +813,7 @@ rp_attachcommon(CONTROLLER_T *ctlp, int num_aiops, int num_ports) rp->rp_intmask = RXF_TRIG | TXFIFO_MT | SRC_INT | DELTA_CD | DELTA_CTS | DELTA_DSR; -#if notdef +#ifdef notdef ChanStatus = sGetChanStatus(&rp->rp_channel); #endif /* notdef */ if(sInitChan(ctlp, &rp->rp_channel, aiop, chan) == 0) { diff --git a/sys/dev/rp/rp_isa.c b/sys/dev/rp/rp_isa.c index ebefe4f..2f61230 100644 --- a/sys/dev/rp/rp_isa.c +++ b/sys/dev/rp/rp_isa.c @@ -242,7 +242,7 @@ rp_attach(device_t dev) ctlp = device_get_softc(dev); -#if notdef +#ifdef notdef num_aiops = sInitController(ctlp, rp_controller, MAX_AIOPS_PER_BOARD, 0, diff --git a/sys/dev/rp/rp_pci.c b/sys/dev/rp/rp_pci.c index f7a080c..46ed561 100644 --- a/sys/dev/rp/rp_pci.c +++ b/sys/dev/rp/rp_pci.c @@ -104,7 +104,7 @@ static devclass_t rp_devclass; static int rp_pciprobe(device_t dev); static int rp_pciattach(device_t dev); -#if notdef +#ifdef notdef static int rp_pcidetach(device_t dev); static int rp_pcishutdown(device_t dev); #endif /* notdef */ @@ -306,7 +306,7 @@ sPCIInitController( CONTROLLER_t *CtlP, CtlP->AiopNumChan[i] = 8; break; default: -#if notdef +#ifdef notdef CtlP->AiopNumChan[i] = 8; #else CtlP->AiopNumChan[i] = sReadAiopNumChan(CtlP, i); diff --git a/sys/dev/rp/rpvar.h b/sys/dev/rp/rpvar.h index 66aa219..9b1790d 100644 --- a/sys/dev/rp/rpvar.h +++ b/sys/dev/rp/rpvar.h @@ -68,6 +68,6 @@ struct rp_port { }; /* Actually not used */ -#if notdef +#ifdef notdef extern struct termios deftermios; #endif /* notdef */ diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 3142753..1e38295 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -644,7 +644,7 @@ csa_initialize(sc_p scp) /* * Set the serial port FIFO pointer to the first sample in the FIFO. */ -#if notdef +#ifdef notdef csa_writeio(resp, BA0_SERBSP, 0); #endif /* notdef */ @@ -698,7 +698,7 @@ csa_initialize(sc_p scp) * First, lets wait a short while to let things settle out a bit, * and to prevent retrying the read too quickly. */ -#if notdef +#ifdef notdef DELAY(10000000L); /* clw */ #else DELAY(1000); @@ -728,7 +728,7 @@ csa_initialize(sc_p scp) * Power down the DAC and ADC. We will power them up (if) when we need * them. */ -#if notdef +#ifdef notdef csa_writeio(resp, BA0_AC97_POWERDOWN, 0x300); #endif /* notdef */ @@ -736,7 +736,7 @@ csa_initialize(sc_p scp) * Turn off the Processor by turning off the software clock enable flag in * the clock control register. */ -#if notdef +#ifdef notdef clkcr1 = csa_readio(resp, BA0_CLKCR1) & ~CLKCR1_SWCE; csa_writeio(resp, BA0_CLKCR1, clkcr1); #endif /* notdef */ diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c index 880527e..e46612d 100644 --- a/sys/dev/usb/if_udav.c +++ b/sys/dev/usb/if_udav.c @@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$"); #include <sys/device.h> #endif -#if NRND > 0 +#if defined(NRND) && NRND > 0 #include <sys/rnd.h> #endif @@ -465,7 +465,7 @@ USB_ATTACH(udav) ether_ifattach(ifp, eaddr); #endif -#if NRND > 0 +#if defined(NRND) && NRND > 0 rnd_attach_source(&sc->rnd_source, devname, RND_TYPE_NET, 0); #endif @@ -529,7 +529,7 @@ USB_DETACH(udav) #endif udav_stop(GET_IFP(sc), 1); -#if NRND > 0 +#if defined(NRND) && NRND > 0 rnd_detach_source(&sc->rnd_source); #endif #if defined(__NetBSD__) diff --git a/sys/dev/usb/if_udavreg.h b/sys/dev/usb/if_udavreg.h index 5982857..426a889 100644 --- a/sys/dev/usb/if_udavreg.h +++ b/sys/dev/usb/if_udavreg.h @@ -194,7 +194,7 @@ struct udav_softc { struct lock sc_mii_lock; int sc_link; #define sc_media udav_mii.mii_media -#if NRND > 0 +#if defined(NRND) && NRND > 0 rndsource_element_t rnd_source; #endif struct ue_cdata sc_cdata; diff --git a/sys/dev/usb/sl811hs.c b/sys/dev/usb/sl811hs.c index 7599f57..2196e9f 100644 --- a/sys/dev/usb/sl811hs.c +++ b/sys/dev/usb/sl811hs.c @@ -1519,7 +1519,7 @@ slhci_transaction(struct slhci_softc *sc, usbd_pipe_handle pipe, sl11write(sc, SL11_ISR, 0xff); DPRINTF(D_XFER, ("t=%d i=%x ", SLHCI_TIMEOUT - timeout, isr)); -#if SLHCI_DEBUG +#ifdef SLHCI_DEBUG bitmask_snprintf(result, "\20\x8STALL\7NAK\6OV\5SETUP\4DATA1\3TIMEOUT\2ERR\1ACK", str, sizeof(str)); @@ -1535,7 +1535,7 @@ slhci_transaction(struct slhci_softc *sc, usbd_pipe_handle pipe, /* Read buffer if PID_IN */ if (pid == SL11_PID_IN && len > 0) { sl11read_region(sc, buf, 0x40, len); -#if SLHCI_DEBUG +#ifdef SLHCI_DEBUG for (i = 0; i < len; i++) DPRINTF(D_XFER, ("%02X ", buf[i])); #endif diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c index 9e853c2..a427b2c 100644 --- a/sys/dev/usb/uplcom.c +++ b/sys/dev/usb/uplcom.c @@ -200,7 +200,7 @@ Static void uplcom_rts(struct uplcom_softc *, int); Static void uplcom_break(struct uplcom_softc *, int); Static void uplcom_set_line_state(struct uplcom_softc *); Static void uplcom_get_status(void *, int, u_char *, u_char *); -#if TODO +#if 0 /* TODO */ Static int uplcom_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr); #endif Static int uplcom_param(void *, int, struct termios *); @@ -988,7 +988,7 @@ uplcom_get_status(void *addr, int portno, u_char *lsr, u_char *msr) *msr = sc->sc_msr; } -#if TODO +#if 0 /* TODO */ Static int uplcom_ioctl(void *addr, int portno, u_long cmd, caddr_t data, int flag, usb_proc_ptr p) diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c index d92dc0d..07e42f5 100644 --- a/sys/dev/usb/uvscom.c +++ b/sys/dev/usb/uvscom.c @@ -203,7 +203,7 @@ Static void uvscom_break(struct uvscom_softc *, int); Static void uvscom_set(void *, int, int, int); Static void uvscom_intr(usbd_xfer_handle, usbd_private_handle, usbd_status); -#if TODO +#if 0 /* TODO */ Static int uvscom_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr); #endif Static int uvscom_param(void *, int, struct termios *); @@ -935,7 +935,7 @@ uvscom_get_status(void *addr, int portno, u_char *lsr, u_char *msr) *msr = sc->sc_msr; } -#if TODO +#if 0 /* TODO */ Static int uvscom_ioctl(void *addr, int portno, u_long cmd, caddr_t data, int flag, usb_proc_ptr p) diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c index 7e71f1c..56cdbc7 100644 --- a/sys/fs/coda/coda_psdev.c +++ b/sys/fs/coda/coda_psdev.c @@ -570,7 +570,7 @@ coda_call(mntinfo, inSize, outSize, buffer) error, i); #endif -#if notyet +#ifdef notyet tempset = td->td_siglist; SIGSETNAND(tempset, td->td_sigmask); printf("coda_call: siglist = %p, sigmask = %p, mask %p\n", diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c index e099fe7..fd2e066 100644 --- a/sys/fs/hpfs/hpfs_vnops.c +++ b/sys/fs/hpfs/hpfs_vnops.c @@ -725,7 +725,7 @@ hpfs_open(ap) struct thread *a_td; } */ *ap; { -#if HPFS_DEBUG +#ifdef HPFS_DEBUG register struct vnode *vp = ap->a_vp; register struct hpfsnode *hp = VTOHP(vp); @@ -754,7 +754,7 @@ hpfs_close(ap) struct thread *a_td; } */ *ap; { -#if HPFS_DEBUG +#ifdef HPFS_DEBUG register struct vnode *vp = ap->a_vp; register struct hpfsnode *hp = VTOHP(vp); diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c index a516194..478ed55 100644 --- a/sys/fs/smbfs/smbfs_io.c +++ b/sys/fs/smbfs/smbfs_io.c @@ -264,7 +264,7 @@ smbfs_writevnode(struct vnode *vp, struct uio *uiop, return error; } if (ioflag & IO_APPEND) { -#if notyet +#ifdef notyet /* * File size can be changed by another client */ diff --git a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c index 95e21fa..d617014 100644 --- a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c +++ b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c @@ -259,7 +259,7 @@ void ext2_free_inode (struct inode * inode) unlock_super (DEVVP(inode)); } -#if linux +#ifdef linux /* * This function increments the inode version number * diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 2db4884..bb01162 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -4955,7 +4955,7 @@ sppp_set_ip_addr(struct sppp *sp, u_long src) if (ifa && si) { int error; -#if __NetBSD_Version__ >= 103080000 +#if defined(__NetBSD__) && __NetBSD_Version__ >= 103080000 struct sockaddr_in new_sin = *si; new_sin.sin_addr.s_addr = htonl(src); diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c index 089ae72..3dfdd22 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c @@ -704,7 +704,7 @@ USB_ATTACH(ubt) goto bad; } -#if __broken__ /* XXX FIXME */ +#if 0 /* XXX FIXME */ /* Isoc-in */ error = usbd_open_pipe(sc->sc_iface1, sc->sc_isoc_in_ep, USBD_EXCLUSIVE_USE, &sc->sc_isoc_in_pipe); @@ -724,7 +724,7 @@ USB_ATTACH(ubt) error); goto bad; } -#endif /* __broken__ */ +#endif /* Create Netgraph node */ if (ng_make_node_common(&typestruct, &sc->sc_node) != 0) { @@ -1906,7 +1906,7 @@ ng_ubt_connect(hook_p hook) goto fail; } -#if __broken__ /* XXX FIXME */ +#if 0 /* XXX FIXME */ /* Start isoc-in transfer */ status = ubt_isoc_in_start(sc); if (status != USBD_NORMAL_COMPLETION) { @@ -1916,7 +1916,7 @@ ng_ubt_connect(hook_p hook) status); goto fail; } -#endif /* __broken__ */ +#endif return (0); fail: @@ -2167,13 +2167,13 @@ ng_ubt_rcvdata(hook_p hook, item_p item) b = UBT_ACL_XMIT; break; -#if __broken__ /* XXX FIXME */ +#if 0 /* XXX FIXME */ case NG_HCI_SCO_DATA_PKT: f = ubt_isoc_out_start; q = &sc->sc_scoq; b = UBT_SCO_XMIT; break; -#endif /* __broken__ */ +#endif default: NG_UBT_ERR( diff --git a/sys/netkey/key_debug.c b/sys/netkey/key_debug.c index 73b3b3d..3cd2191 100644 --- a/sys/netkey/key_debug.c +++ b/sys/netkey/key_debug.c @@ -680,7 +680,7 @@ kdebug_secasv(sav) if (sav->lft_s != NULL) kdebug_sadb_lifetime((struct sadb_ext *)sav->lft_s); -#if notyet +#ifdef notyet /* XXX: misc[123] ? */ #endif diff --git a/sys/pci/viapm.c b/sys/pci/viapm.c index e333104..c4809e8 100644 --- a/sys/pci/viapm.c +++ b/sys/pci/viapm.c @@ -340,7 +340,7 @@ viapm_pro_attach(device_t dev) viapm->st = rman_get_bustag(viapm->iores); viapm->sh = rman_get_bushandle(viapm->iores); -#if notyet +#ifdef notyet /* force irq 9 */ l = pci_read_config(dev, VIAPM_PRO_SMBCTRL, 1); pci_write_config(dev, VIAPM_PRO_SMBCTRL, l | 0x80, 1); @@ -377,7 +377,7 @@ viapm_pro_attach(device_t dev) l = pci_read_config(dev, VIAPM_PRO_SMBCTRL, 1); pci_write_config(dev, VIAPM_PRO_SMBCTRL, l | 1, 1); -#if notyet +#ifdef notyet /* enable interrupts */ VIAPM_OUTB(SMBHCTRL, VIAPM_INB(SMBHCTRL) | SMBHCTRL_ENABLE); #endif @@ -393,7 +393,7 @@ viapm_pro_attach(device_t dev) error: if (viapm->iores) bus_release_resource(dev, SYS_RES_IOPORT, viapm->iorid, viapm->iores); -#if notyet +#ifdef notyet if (viapm->irqres) bus_release_resource(dev, SYS_RES_IRQ, viapm->irqrid, viapm->irqres); #endif @@ -464,7 +464,7 @@ viapm_pro_detach(device_t dev) viapm->iorid, viapm->iores))) return (error); -#if notyet +#ifdef notyet if ((error = bus_release_resource(dev, SYS_RES_IRQ, viapm->irqrid, viapm->irqres)) return (error); |
