aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPranith Kumar <bobby.prani@gmail.com>2016-08-09 15:02:27 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2016-08-09 22:57:36 +0200
commit2368635d3943294c672a62abd60a233aca708982 (patch)
treec53b3ebafb599be07bf547c2187f1bdf1a7a7ff9 /include
parent435405ac59b9334b06285e1192c693b497282a31 (diff)
clang: Fix warning reg. expansion to 'defined'
Clang produces the following warning. The warning is detailed here: https://reviews.llvm.org/D15866. Fix the warning. /home/pranith/devops/code/qemu/hw/display/qxl.c:507:5: warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined] ^ /home/pranith/devops/code/qemu/include/ui/qemu-spice.h:46:5: note: expanded from macro 'SPICE_NEEDS_SET_MM_TIME' (!defined(SPICE_SERVER_VERSION) || (SPICE_SERVER_VERSION < 0xc06)) ^ /home/pranith/devops/code/qemu/hw/display/qxl.c:1074:5: warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined] ^ /home/pranith/devops/code/qemu/include/ui/qemu-spice.h:46:5: note: expanded from macro 'SPICE_NEEDS_SET_MM_TIME' (!defined(SPICE_SERVER_VERSION) || (SPICE_SERVER_VERSION < 0xc06)) Suggested-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Pranith Kumar <bobby.prani@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/ui/qemu-spice.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index edad5e7bbf..75e12396bb 100644
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -42,8 +42,11 @@ int qemu_spice_set_pw_expire(time_t expires);
int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
const char *subject);
-#define SPICE_NEEDS_SET_MM_TIME \
- (!defined(SPICE_SERVER_VERSION) || (SPICE_SERVER_VERSION < 0xc06))
+#if !defined(SPICE_SERVER_VERSION) || (SPICE_SERVER_VERSION < 0xc06)
+#define SPICE_NEEDS_SET_MM_TIME 1
+#else
+#define SPICE_NEEDS_SET_MM_TIME 0
+#endif
#if SPICE_SERVER_VERSION >= 0x000c02
void qemu_spice_register_ports(void);