summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe/rf_options.h
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-02-16 00:03:34 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-02-16 00:03:34 +0000
commit086450a69044f3ede65845d9a616116db9a6d006 (patch)
treea91a7d8f967737b7eed23cb127849d08e3af4d63 /sys/dev/raidframe/rf_options.h
parent41fb84abc5659cc1a368cd59d7929ddf756c3297 (diff)
Merge from NetBSD, mostly indentation
Diffstat (limited to 'sys/dev/raidframe/rf_options.h')
-rw-r--r--sys/dev/raidframe/rf_options.h30
1 files changed, 10 insertions, 20 deletions
diff --git a/sys/dev/raidframe/rf_options.h b/sys/dev/raidframe/rf_options.h
index 2b5499cb672..fa603b61419 100644
--- a/sys/dev/raidframe/rf_options.h
+++ b/sys/dev/raidframe/rf_options.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: rf_options.h,v 1.1 1999/01/11 14:29:33 niklas Exp $ */
-/* $NetBSD: rf_options.h,v 1.1 1998/11/13 04:20:31 oster Exp $ */
+/* $OpenBSD: rf_options.h,v 1.2 1999/02/16 00:03:02 niklas Exp $ */
+/* $NetBSD: rf_options.h,v 1.3 1999/02/05 00:06:13 oster Exp $ */
/*
* rf_options.h
*/
@@ -33,36 +33,26 @@
#ifndef _RF__RF_OPTIONS_H_
#define _RF__RF_OPTIONS_H_
-#ifdef _KERNEL
-#define KERNEL
-#endif
-
-#ifdef KERNEL
-#if !defined(__NetBSD__) && !defined(__OpenBSD__)
-#include <dfstrace.h>
-#endif /* !__NetBSD__ && !__OpenBSD__ */
-#endif /* KERNEL */
-
#define RF_DEFAULT_LOCK_TABLE_SIZE 256
typedef struct RF_DebugNames_s {
- char *name;
- long *ptr;
-} RF_DebugName_t;
+ char *name;
+ long *ptr;
+} RF_DebugName_t;
extern RF_DebugName_t rf_debugNames[];
#ifdef RF_DBG_OPTION
#undef RF_DBG_OPTION
-#endif /* RF_DBG_OPTION */
+#endif /* RF_DBG_OPTION */
#ifdef __STDC__
#define RF_DBG_OPTION(_option_,_defval_) extern long rf_##_option_;
-#else /* __STDC__ */
+#else /* __STDC__ */
#define RF_DBG_OPTION(_option_,_defval_) extern long rf_/**/_option_;
-#endif /* __STDC__ */
+#endif /* __STDC__ */
#include "rf_optnames.h"
-void rf_ResetDebugOptions(void);
+void rf_ResetDebugOptions(void);
-#endif /* !_RF__RF_OPTIONS_H_ */
+#endif /* !_RF__RF_OPTIONS_H_ */