the rest of the '#if DIAGNOSTIC' -> '#ifdef DIAGNOSTIC' in the kernel; ok miod@

9 files changed, 19 insertions, 19 deletions

diff --git a/sys/arch/mac68k/dev/if_ae.c b/sys/arch/mac68k/dev/if_ae.c
index 210686ee915..105205d0d95 100644
--- a/sys/arch/mac68k/dev/if_ae.c
+++ b/sys/arch/mac68k/dev/if_ae.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ae.c,v 1.22 2004/04/16 22:54:48 xsa Exp $	*/
+/*	$OpenBSD: if_ae.c,v 1.23 2004/08/03 12:10:47 todd Exp $	*/
 /*	$NetBSD: if_ae.c,v 1.62 1997/04/24 16:52:05 scottr Exp $	*/
 
 /*
@@ -443,7 +443,7 @@ outloop:
 	buffer = (sc->txb_new * ED_TXBUF_SIZE) << ED_PAGE_SHIFT;
 
 	len = ae_put(sc, m0, buffer);
-#if DIAGNOSTIC
+#ifdef DIAGNOSTIC
 	if (len != m0->m_pkthdr.len)
 		printf("aestart: len %d != m0->m_pkthdr.len %d.\n",
 			len, m0->m_pkthdr.len);
diff --git a/sys/arch/mac68k/dev/mac68k5380.c b/sys/arch/mac68k/dev/mac68k5380.c
index ca239678d05..e6c07b743d8 100644
--- a/sys/arch/mac68k/dev/mac68k5380.c
+++ b/sys/arch/mac68k/dev/mac68k5380.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mac68k5380.c,v 1.17 2003/03/14 10:47:36 miod Exp $	*/
+/*	$OpenBSD: mac68k5380.c,v 1.18 2004/08/03 12:10:47 todd Exp $	*/
 /*	$NetBSD: mac68k5380.c,v 1.29 1997/02/28 15:50:50 scottr Exp $	*/
 
 /*
@@ -585,7 +585,7 @@ transfer_pdma(phasep, data, count)
 	while (    ((GET_5380_REG(NCR5380_IDSTAT) & SC_S_BSY) == 0)
 		&& (--scsi_timeout) );
 	if (!scsi_timeout) {
-#if DIAGNOSTIC
+#ifdef DIAGNOSTIC
 		printf("scsi timeout: waiting for BSY in %s.\n",
 			(*phasep == PH_DATAOUT) ? "pdma_out" : "pdma_in");
 #endif
diff --git a/sys/arch/mac68k/dev/z8530sc.c b/sys/arch/mac68k/dev/z8530sc.c
index 37a02ad2239..acded984c68 100644
--- a/sys/arch/mac68k/dev/z8530sc.c
+++ b/sys/arch/mac68k/dev/z8530sc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530sc.c,v 1.5 2003/06/02 23:27:49 millert Exp $	*/
+/*	$OpenBSD: z8530sc.c,v 1.6 2004/08/03 12:10:47 todd Exp $	*/
 /*	$NetBSD: z8530sc.c,v 1.1 1996/05/18 18:54:28 briggs Exp $	*/
 
 /*
@@ -293,7 +293,7 @@ zsc_intr_hard(arg)
 	register struct zs_chanstate *cs_b;
 	register int rval;
 	register u_char rr3, rr3a;
-#if DIAGNOSTIC
+#ifdef DIAGNOSTIC
 	register int loopcount;
 	loopcount = ZS_INTERRUPT_CNT;
 #endif
@@ -307,7 +307,7 @@ zsc_intr_hard(arg)
 	rr3 = zs_read_reg(cs_a, 3);
 
 	while ((rr3 = zs_read_reg(cs_a, ZSRR_IPEND))
-#if DIAGNOSTIC
+#ifdef DIAGNOSTIC
 		 && --loopcount
 #endif
 		) {
@@ -332,7 +332,7 @@ zsc_intr_hard(arg)
 	
 		rr3a |= rr3;
 	}
-#if DIAGNOSTIC
+#ifdef DIAGNOSTIC
 	if (loopcount == 0) {
 		if (rr3 & (ZSRR3_IP_A_RX | ZSRR3_IP_A_TX | ZSRR3_IP_A_STAT))
 			cs_a->cs_flags |= ZS_FLAGS_INTERRUPT_OVERRUN;
diff --git a/sys/arch/mac68k/mac68k/clock.c b/sys/arch/mac68k/mac68k/clock.c
index eda5931e108..c2280ca6821 100644
--- a/sys/arch/mac68k/mac68k/clock.c
+++ b/sys/arch/mac68k/mac68k/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.15 2003/06/02 23:27:49 millert Exp $	*/
+/*	$OpenBSD: clock.c,v 1.16 2004/08/03 12:10:47 todd Exp $	*/
 /*	$NetBSD: clock.c,v 1.36 1997/10/07 03:04:55 scottr Exp $	*/
 
 /*
@@ -342,7 +342,7 @@ inittodr(base)
 
 	timbuf = pramt_2_ugmt(pram_readtime());
 	if ((timbuf - (macos_boottime + 60 * tz.tz_minuteswest)) > 10 * 60) {
-#if DIAGNOSTIC
+#ifdef DIAGNOSTIC
 		printf(
 		    "PRAM time does not appear to have been read correctly.\n");
 		printf("PRAM: 0x%lx, macos_boottime: 0x%lx.\n",
diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c
index 09ffc5404b7..5fe168f12f0 100644
--- a/sys/compat/linux/linux_getcwd.c
+++ b/sys/compat/linux/linux_getcwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_getcwd.c,v 1.4 2004/06/22 23:52:18 jfb Exp $ */
+/* $OpenBSD: linux_getcwd.c,v 1.5 2004/08/03 12:10:47 todd Exp $ */
 /* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */
 
 /*-
@@ -487,7 +487,7 @@ linux_getcwd_common (lvp, rvp, bpp, bufp, limit, flags, p)
 			error = linux_getcwd_scandir(&lvp, &uvp, &bp, bufp, p);
 		if (error)
 			goto out;
-#if DIAGNOSTIC		
+#ifdef DIAGNOSTIC		
 		if (lvp != NULL)
 			panic("getcwd: oops, forgot to null lvp");
 		if (bufp && (bp <= bufp)) {
diff --git a/sys/compat/netbsd/netbsd_getcwd.c b/sys/compat/netbsd/netbsd_getcwd.c
index f78a8628557..5c5a00ebde6 100644
--- a/sys/compat/netbsd/netbsd_getcwd.c
+++ b/sys/compat/netbsd/netbsd_getcwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netbsd_getcwd.c,v 1.6 2002/03/14 01:26:50 millert Exp $ */
+/* $OpenBSD: netbsd_getcwd.c,v 1.7 2004/08/03 12:10:47 todd Exp $ */
 /* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */
 
 /*-
@@ -481,7 +481,7 @@ netbsd_getcwd_common (lvp, rvp, bpp, bufp, limit, flags, p)
 			error = netbsd_getcwd_scandir(&lvp, &uvp, &bp, bufp, p);
 		if (error)
 			goto out;
-#if DIAGNOSTIC		
+#ifdef DIAGNOSTIC		
 		if (lvp != NULL)
 			panic("getcwd: oops, forgot to null lvp");
 		if (bufp && (bp <= bufp)) {
diff --git a/sys/net/pfkey.c b/sys/net/pfkey.c
index 7a0a6d70fa1..03906b349c6 100644
--- a/sys/net/pfkey.c
+++ b/sys/net/pfkey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfkey.c,v 1.14 2003/02/16 21:30:13 deraadt Exp $	*/
+/*	$OpenBSD: pfkey.c,v 1.15 2004/08/03 12:10:48 todd Exp $	*/
 
 /*
  *	@(#)COPYRIGHT	1.1 (NRL) 17 January 1995
@@ -165,7 +165,7 @@ pfkey_output(struct mbuf *mbuf, struct socket *socket)
 	void *message;
 	int error = 0;
 
-#if DIAGNOSTIC
+#ifdef DIAGNOSTIC
 	if (!mbuf || !(mbuf->m_flags & M_PKTHDR)) {
 		error = EINVAL;
 		goto ret;
diff --git a/sys/uvm/uvm_fault.c b/sys/uvm/uvm_fault.c
index 12cfc54cda9..072807149c2 100644
--- a/sys/uvm/uvm_fault.c
+++ b/sys/uvm/uvm_fault.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_fault.c,v 1.32 2004/02/23 06:19:32 drahn Exp $	*/
+/*	$OpenBSD: uvm_fault.c,v 1.33 2004/08/03 12:10:48 todd Exp $	*/
 /*	$NetBSD: uvm_fault.c,v 1.51 2000/08/06 00:22:53 thorpej Exp $	*/
 
 /*
@@ -1574,7 +1574,7 @@ Case2:
 		 * if we are going to promote the data to an anon we
 		 * allocate a blank anon here and plug it into our amap.
 		 */
-#if DIAGNOSTIC
+#ifdef DIAGNOSTIC
 		if (amap == NULL)
 			panic("uvm_fault: want to promote data, but no anon");
 #endif
diff --git a/sys/xfs/xfs_vnodeops-common.c b/sys/xfs/xfs_vnodeops-common.c
index 05be482af73..9cea2173aa6 100644
--- a/sys/xfs/xfs_vnodeops-common.c
+++ b/sys/xfs/xfs_vnodeops-common.c
@@ -298,7 +298,7 @@ xfs_close_common(struct vnode *vp, int fflag,
 size_t
 xfs_uio_end_length (struct uio *uio)
 {
-#if DIAGNOSTIC
+#ifdef DIAGNOSTIC
     size_t sz = 0;
     int i;