summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkn <kn@cvs.openbsd.org>2019-01-06 14:59:57 +0000
committerkn <kn@cvs.openbsd.org>2019-01-06 14:59:57 +0000
commit0955ffc8cc58858ece08ce90c9062bde5bf16b88 (patch)
treeabb052726916de27d5bc77043c26380a8f74af50
parent15075663172e8584efec0d49c3ec12ffaa36db89 (diff)
Unbreak SR_DEBUG builds
In arch/amd64/amd64/machdep.c r1.239 (21.02.2018) guenther added DPRINTF, redefining the one from dev/softraidvar.h. softraid(4) has been using DNPRINTF exclusively since import in 2007, so simply remove the DPRINTF macro definition from there. OK krw
-rw-r--r--sys/dev/softraidvar.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/softraidvar.h b/sys/dev/softraidvar.h
index 935d868e2eb..9446e039cd0 100644
--- a/sys/dev/softraidvar.h
+++ b/sys/dev/softraidvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraidvar.h,v 1.167 2017/06/12 16:39:51 jsing Exp $ */
+/* $OpenBSD: softraidvar.h,v 1.168 2019/01/06 14:59:56 kn Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -313,7 +313,6 @@ SLIST_HEAD(sr_boot_volume_head, sr_boot_volume);
/* #define SR_DEBUG */
#ifdef SR_DEBUG
extern u_int32_t sr_debug;
-#define DPRINTF(x...) do { if (sr_debug) printf(x); } while(0)
#define DNPRINTF(n,x...) do { if (sr_debug & n) printf(x); } while(0)
#define SR_D_CMD 0x0001
#define SR_D_INTR 0x0002
@@ -326,7 +325,6 @@ extern u_int32_t sr_debug;
#define SR_D_STATE 0x0100
#define SR_D_REBUILD 0x0200
#else
-#define DPRINTF(x...)
#define DNPRINTF(n,x...)
#endif