From patchwork Sat Nov 19 18:53:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 696880 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tLkYd0G3bz9t0J for ; Sun, 20 Nov 2016 05:54:28 +1100 (AEDT) Received: from localhost ([::1]:42432 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8AmM-0003vj-K5 for incoming@patchwork.ozlabs.org; Sat, 19 Nov 2016 13:54:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8AlV-0003Qi-65 for qemu-devel@nongnu.org; Sat, 19 Nov 2016 13:53:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c8AlS-0003Pg-4y for qemu-devel@nongnu.org; Sat, 19 Nov 2016 13:53:29 -0500 Received: from mail.weilnetz.de ([37.221.199.173]:56683) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8AlR-0003PY-UN; Sat, 19 Nov 2016 13:53:26 -0500 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by mail.weilnetz.de (Postfix) with ESMTP id 43F9311810A9; Sat, 19 Nov 2016 19:53:23 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from mail.weilnetz.de ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fr2mDX6Rn8g7; Sat, 19 Nov 2016 19:53:21 +0100 (CET) Received: from qemu.weilnetz.de (qemu.weilnetz.de [188.68.58.204]) by mail.weilnetz.de (Postfix) with ESMTP id 04E1511810A8; Sat, 19 Nov 2016 19:53:20 +0100 (CET) Received: by qemu.weilnetz.de (Postfix, from userid 1000) id A2DA34677CA; Sat, 19 Nov 2016 19:53:20 +0100 (CET) From: Stefan Weil To: QEMU Developer Date: Sat, 19 Nov 2016 19:53:18 +0100 Message-Id: <20161119185318.10564-1-sw@weilnetz.de> X-Mailer: git-send-email 2.10.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 37.221.199.173 Subject: [Qemu-devel] [PATCH for-2.8] curses: Fix compiler warnings (Mingw-w64 redefinition of macro KEY_EVENT) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: QEMU Trivial , Stefan Weil , Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" For builds with Mingw-w64 as it is included in Cygwin, there are two header files which define KEY_EVENT with different values. This results in lots of compiler warnings like this one: CC vl.o In file included from /qemu/include/ui/console.h:340:0, from /qemu/vl.c:76: /usr/i686-w64-mingw32/sys-root/mingw/include/curses.h:1522:0: warning: "KEY_EVENT" redefined #define KEY_EVENT 0633 /* We were interrupted by an event */ In file included from /usr/share/mingw-w64/include/windows.h:74:0, from /usr/share/mingw-w64/include/winsock2.h:23, from /qemu/include/sysemu/os-win32.h:29, from /qemu/include/qemu/osdep.h:100, from /qemu/vl.c:24: /usr/share/mingw-w64/include/wincon.h:101:0: note: this is the location of the previous definition #define KEY_EVENT 0x1 QEMU only uses the KEY_EVENT macro from wincon.h. Therefore we can undefine the macro coming from curses.h. The explicit include statement for curses.h in ui/curses.c is not needed and was removed. Those two modifications fix the redefinition warnings. Signed-off-by: Stefan Weil Acked-by: Samuel Thibault --- include/ui/console.h | 3 +++ ui/curses.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/ui/console.h b/include/ui/console.h index e2589e2..e5ae506 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -337,7 +337,10 @@ static inline pixman_format_code_t surface_format(DisplaySurface *s) } #ifdef CONFIG_CURSES +/* KEY_EVENT is defined in wincon.h and in curses.h. Avoid redefinition. */ +#undef KEY_EVENT #include +#undef KEY_EVENT typedef chtype console_ch_t; extern chtype vga_to_curses[]; #else diff --git a/ui/curses.c b/ui/curses.c index 2e132a7..03cefdf 100644 --- a/ui/curses.c +++ b/ui/curses.c @@ -22,7 +22,6 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include #ifndef _WIN32 #include