From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36281) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXCIO-0007gD-VZ for qemu-devel@nongnu.org; Tue, 09 Aug 2016 15:02:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bXCIM-0002gz-OA for qemu-devel@nongnu.org; Tue, 09 Aug 2016 15:02:35 -0400 Received: from mail-yw0-x243.google.com ([2607:f8b0:4002:c05::243]:35119) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXCIM-0002gq-KA for qemu-devel@nongnu.org; Tue, 09 Aug 2016 15:02:34 -0400 Received: by mail-yw0-x243.google.com with SMTP id r9so912695ywg.2 for ; Tue, 09 Aug 2016 12:02:34 -0700 (PDT) From: Pranith Kumar Date: Tue, 9 Aug 2016 15:02:27 -0400 Message-Id: <20160809190229.27871-4-bobby.prani@gmail.com> In-Reply-To: <20160809190229.27871-1-bobby.prani@gmail.com> References: <20160809190229.27871-1-bobby.prani@gmail.com> Subject: [Qemu-devel] [PATCH 4/5] clang: Fix warning reg. expansion to 'defined' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann , "open list:All patches CC here" Cc: pbonzini@redhat.com, peter.maydell@linaro.org 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 Signed-off-by: Pranith Kumar --- include/ui/qemu-spice.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index edad5e7..75e1239 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); -- 2.9.2