Rename "str" to "xxstr" to avoid a conflict with lib/x86/processor.h. Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx> --- lib/libcflat.h | 3 +++ x86/taskswitch2.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libcflat.h b/lib/libcflat.h index f734fde..3dc3788 100644 --- a/lib/libcflat.h +++ b/lib/libcflat.h @@ -22,6 +22,9 @@ #include <stdarg.h> +#define xstr(s) xxstr(s) +#define xxstr(s) #s + typedef unsigned char u8; typedef signed char s8; typedef unsigned short u16; diff --git a/x86/taskswitch2.c b/x86/taskswitch2.c index 3c8418e..08bcce9 100644 --- a/x86/taskswitch2.c +++ b/x86/taskswitch2.c @@ -9,9 +9,6 @@ #define MAIN_TSS_INDEX (FREE_GDT_INDEX + 0) #define VM86_TSS_INDEX (FREE_GDT_INDEX + 1) -#define xstr(s) str(s) -#define str(s) #s - static volatile int test_count; static volatile unsigned int test_divider; -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
