summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2017-04-29 22:51:58 +0200
committerRichard Braun <rbraun@sceen.net>2017-04-29 22:53:00 +0200
commitfb13a50dca9a526c6a1666fefe123b58524040ff (patch)
tree5734dbe449fab880fd3cf9bc154645cf2df53049
parenta9fedfa33cdcb3a3ea7feae06220609f8f3db0e6 (diff)
Revert "Remove unneeded quotes when using #error"
This reverts commit b1aa94d0c7dba4138f651e6b081c1a0055ea8d54. New occurrences of #error are also affected by this commit.
-rw-r--r--arch/x86/machine/asm.h2
-rw-r--r--kern/rdxtree.c2
-rw-r--r--kern/sleepq.c2
-rw-r--r--kern/spinlock.c8
-rw-r--r--kern/turnstile.c2
-rw-r--r--vm/vm_kmem.h2
6 files changed, 9 insertions, 9 deletions
diff --git a/arch/x86/machine/asm.h b/arch/x86/machine/asm.h
index a86fa1f7..6118bb8a 100644
--- a/arch/x86/machine/asm.h
+++ b/arch/x86/machine/asm.h
@@ -19,7 +19,7 @@
#define _X86_ASM_H
#ifndef __ASSEMBLER__
-#error asm.h included from a C file
+#warning "asm.h included from a C file"
#endif /* __ASSEMBLER__ */
#include <machine/param.h>
diff --git a/kern/rdxtree.c b/kern/rdxtree.c
index 87fbcfdc..788f3ba8 100644
--- a/kern/rdxtree.c
+++ b/kern/rdxtree.c
@@ -49,7 +49,7 @@ typedef unsigned long rdxtree_bm_t;
typedef unsigned long long rdxtree_bm_t;
#define rdxtree_ffs(x) __builtin_ffsll(x)
#else /* RDXTREE_RADIX < 6 */
-#error radix too high
+#error "radix too high"
#endif /* RDXTREE_RADIX < 6 */
/*
diff --git a/kern/sleepq.c b/kern/sleepq.c
index c4946532..09548db6 100644
--- a/kern/sleepq.c
+++ b/kern/sleepq.c
@@ -54,7 +54,7 @@ struct sleepq_waiter {
#define SLEEPQ_COND_HTABLE_SIZE 64
#if !ISP2(SLEEPQ_HTABLE_SIZE) || !ISP2(SLEEPQ_COND_HTABLE_SIZE)
-#error hash table size must be a power of two
+#error "hash table size must be a power of two"
#endif /* !ISP2(SLEEPQ_HTABLE_SIZE) */
#define SLEEPQ_HTABLE_MASK (SLEEPQ_HTABLE_SIZE - 1)
diff --git a/kern/spinlock.c b/kern/spinlock.c
index 0e6f2fa8..8f42e9c2 100644
--- a/kern/spinlock.c
+++ b/kern/spinlock.c
@@ -92,11 +92,11 @@
#define SPINLOCK_QID_LOCKED SPINLOCK_LOCKED
#if SPINLOCK_QID_BITS > SPINLOCK_QID_MAX_BITS
-#error spinlock qid too large
+#error "spinlock qid too large"
#endif
#if X15_MAX_CPUS > (1 << SPINLOCK_QID_CPU_BITS)
-#error maximum number of supported processors too large
+#error "maximum number of supported processors too large"
#endif
struct spinlock_qnode {
@@ -111,11 +111,11 @@ struct spinlock_qnode {
#define SPINLOCK_NR_CTXS 4
#if SPINLOCK_CTX_INVALID != 0
-#error the invalid context value must be 0
+#error "the invalid context value must be 0"
#endif
#if SPINLOCK_NR_CTXS > SPINLOCK_QID_CTX_MAX
-#error maximum number of contexts too large
+#error "maximum number of contexts too large"
#endif
struct spinlock_cpu_data {
diff --git a/kern/turnstile.c b/kern/turnstile.c
index f5e94db5..7b27d841 100644
--- a/kern/turnstile.c
+++ b/kern/turnstile.c
@@ -112,7 +112,7 @@ struct turnstile_waiter {
#define TURNSTILE_HTABLE_SIZE 128
#if !ISP2(TURNSTILE_HTABLE_SIZE)
-#error hash table size must be a power of two
+#error "hash table size must be a power of two"
#endif /* !ISP2(TURNSTILE_HTABLE_SIZE) */
#define TURNSTILE_HTABLE_MASK (TURNSTILE_HTABLE_SIZE - 1)
diff --git a/vm/vm_kmem.h b/vm/vm_kmem.h
index 615ff59a..c4b5295c 100644
--- a/vm/vm_kmem.h
+++ b/vm/vm_kmem.h
@@ -27,7 +27,7 @@
* report allocation errors.
*/
#if VM_MIN_KMEM_ADDRESS == 0
-#error kernel space must not start at address 0
+#error "kernel space must not start at address 0"
#endif /* VM_MIN_KMEM_ADDRESS == 0 */
/*