[src/netbsd-1-5]: src/sys/ufs/ffs Pull up rev. 1.3:

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

details:   https://anonhg.NetBSD.org/src/rev/bdd3f4620517
branches:  netbsd-1-5
changeset: 488326:bdd3f4620517
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Jun 29 23:44:33 2000 +0000

description:
Pull up rev. 1.3:
We shouldn't be defining DEBUG and DIAGNOSTIC on our own; these may be
unwanted side-effects in the header files. For now, do the internal
#defines after including the headers.

diffstat:

 sys/ufs/ffs/ffs_softdep.c |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (43 lines):

diff -r 404da24c6353 -r bdd3f4620517 sys/ufs/ffs/ffs_softdep.c
--- a/sys/ufs/ffs/ffs_softdep.c Thu Jun 29 23:35:08 2000 +0000
+++ b/sys/ufs/ffs/ffs_softdep.c Thu Jun 29 23:44:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_softdep.c,v 1.2.2.2 2000/06/23 14:32:22 fvdl Exp $ */
+/*     $NetBSD: ffs_softdep.c,v 1.2.2.3 2000/06/29 23:44:33 thorpej Exp $      */
 
 /*
  * Copyright 1998 Marshall Kirk McKusick. All Rights Reserved.
@@ -32,16 +32,6 @@
  * from: @(#)ffs_softdep.c 9.56 (McKusick) 1/17/00
  */
 
-/*
- * For now we want the safety net that the DIAGNOSTIC and DEBUG flags provide.
- */
-#ifndef DIAGNOSTIC
-#define DIAGNOSTIC
-#endif
-#ifndef DEBUG
-#define DEBUG
-#endif
-
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/callout.h>
@@ -64,6 +54,16 @@
 #include <ufs/ufs/ufs_bswap.h>
 
 /*
+ * For now we want the safety net that the DIAGNOSTIC and DEBUG flags provide.
+ */
+#ifndef DIAGNOSTIC
+#define DIAGNOSTIC
+#endif
+#ifndef DEBUG
+#define DEBUG
+#endif
+
+/*
  * These definitions need to be adapted to the system to which
  * this file is being ported.
  */