diff options
| author | Richard Braun <rbraun@sceen.net> | 2012-10-10 21:18:28 +0200 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2012-10-10 21:18:28 +0200 |
| commit | 9fca6eb45592792df43bca63fb1bb7979254115e (patch) | |
| tree | 096916febf9fb335a9a46300b6fa0e73421fc943 | |
| parent | 696a41936ac9712f928c86be1b61bd1baea7405c (diff) | |
macros: minor change
Rename XQUOTE to __QUOTE.
| -rw-r--r-- | arch/x86/machine/cpu.h | 4 | ||||
| -rw-r--r-- | lib/assert.h | 2 | ||||
| -rw-r--r-- | lib/macros.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/machine/cpu.h b/arch/x86/machine/cpu.h index 823b9d28..4f451590 100644 --- a/arch/x86/machine/cpu.h +++ b/arch/x86/machine/cpu.h @@ -163,14 +163,14 @@ cpu_get_ ## name(void) \ { \ unsigned long name; \ \ - asm volatile("mov %%" XQUOTE(name) ", %0" : "=r" (name)); \ + asm volatile("mov %%" __QUOTE(name) ", %0" : "=r" (name)); \ return name; \ } \ \ static __always_inline void \ cpu_set_ ## name(unsigned long value) \ { \ - asm volatile("mov %0, %%" XQUOTE(name) : : "r" (value)); \ + asm volatile("mov %0, %%" __QUOTE(name) : : "r" (value)); \ } /* diff --git a/lib/assert.h b/lib/assert.h index 19da04c1..79e23680 100644 --- a/lib/assert.h +++ b/lib/assert.h @@ -32,7 +32,7 @@ MACRO_BEGIN \ if (unlikely(!(expression))) \ panic("assertion (%s) failed in %s:%d, function %s()", \ - XQUOTE(expression), __FILE__, __LINE__, __func__); \ + __QUOTE(expression), __FILE__, __LINE__, __func__); \ MACRO_END #endif /* NDEBUG */ diff --git a/lib/macros.h b/lib/macros.h index 4894a335..aec24e1b 100644 --- a/lib/macros.h +++ b/lib/macros.h @@ -28,8 +28,8 @@ #define MACRO_BEGIN ({ #define MACRO_END }) -#define XQUOTE(x) #x -#define QUOTE(x) XQUOTE(x) +#define __QUOTE(x) #x +#define QUOTE(x) __QUOTE(x) #ifdef __ASSEMBLY__ #define DECL_CONST(x, s) x |