4 files changed, 8 insertions, 8 deletions

diff --git a/sys/dev/aic7xxx/aic79xx_osm.h b/sys/dev/aic7xxx/aic79xx_osm.h
index b68770d2fc45..7e2291fb35cb 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.h
+++ b/sys/dev/aic7xxx/aic79xx_osm.h
@@ -144,7 +144,7 @@ struct scb_platform_data {
 };
 
 /***************************** Core Includes **********************************/
-#if AHD_REG_PRETTY_PRINT
+#ifdef AHD_REG_PRETTY_PRINT
 #define AIC_DEBUG_REGISTERS 1
 #else
 #define AIC_DEBUG_REGISTERS 0
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index 1e829460de34..684dfc11b74b 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -43,14 +43,14 @@
 #define fillw_io(p, d, c)	fillw((p), (void *)(d), (c))
 void generic_bcopy(const void *s, void *d, size_t c);
 void generic_bzero(void *d, size_t c);
-#elif __amd64__
+#elif defined(__amd64__)
 #define bcopy_io(s, d, c)	bcopy((void *)(s), (void *)(d), (c))
 #define bcopy_toio(s, d, c)	bcopy((void *)(s), (void *)(d), (c))
 #define bcopy_fromio(s, d, c)	bcopy((void *)(s), (void *)(d), (c))
 #define bzero_io(d, c)		bzero((void *)(d), (c))
 #define fill_io(p, d, c)	fill((p), (void *)(d), (c))
 #define fillw_io(p, d, c)	fillw((p), (void *)(d), (c))
-#elif __ia64__
+#elif defined(__ia64__)
 #include <machine/bus.h>
 #define	bcopy_fromio(s, d, c)	\
 	bus_space_read_region_1(IA64_BUS_SPACE_MEM, s, 0, (void*)(d), c)
@@ -75,7 +75,7 @@ fillw(int val, uint16_t *buf, size_t size)
 	while (size--)
 		*buf++ = val;
 }
-#elif __powerpc__
+#elif defined(__powerpc__)
 
 #define bcopy_io(s, d, c)	ofwfb_bcopy((void *)(s), (void *)(d), (c))
 #define bcopy_toio(s, d, c)	ofwfb_bcopy((void *)(s), (void *)(d), (c))
diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c
index ce7c920a0090..e6c0dd64314a 100644
--- a/sys/dev/snc/dp83932.c
+++ b/sys/dev/snc/dp83932.c
@@ -70,7 +70,7 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/errno.h>
-#if NRND > 0
+#if defined(NRND) && NRND > 0
 #include <sys/rnd.h>
 #endif
 
@@ -202,7 +202,7 @@ sncconfig(sc, media, nmedia, defmedia, myea)
 
 	ether_ifattach(ifp, myea);
 
-#if NRND > 0
+#if defined(NRND) && NRND > 0
 	rnd_attach_source(&sc->rnd_source, device_get_nameunit(sc->sc_dev),
 	    RND_TYPE_NET, 0);
 #endif
@@ -890,7 +890,7 @@ sncintr(arg)
 		}
 		sncstart(sc->sc_ifp);
 
-#if NRND > 0
+#if defined(NRND) && NRND > 0
 		if (isr)
 			rnd_add_uint32(&sc->rnd_source, isr);
 #endif
diff --git a/sys/dev/snc/dp83932var.h b/sys/dev/snc/dp83932var.h
index 9570162ed8cc..59ffefbd5a2c 100644
--- a/sys/dev/snc/dp83932var.h
+++ b/sys/dev/snc/dp83932var.h
@@ -226,7 +226,7 @@ typedef struct snc_softc {
 	void	*sc_sh;		/* shutdownhook cookie */
 	int	gone;
 
-#if NRND > 0
+#if defined(NRND) && NRND > 0
 	rndsource_element_t	rnd_source;
 #endif
 } snc_softc_t;