From patchwork Wed Feb 27 06:35:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: liguang X-Patchwork-Id: 223513 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BEC7F2C0084 for ; Wed, 27 Feb 2013 17:36:08 +1100 (EST) Received: from localhost ([::1]:53922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAacX-0006oa-CI for incoming@patchwork.ozlabs.org; Wed, 27 Feb 2013 01:36:05 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAacP-0006oG-4p for qemu-devel@nongnu.org; Wed, 27 Feb 2013 01:35:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UAacK-000370-VI for qemu-devel@nongnu.org; Wed, 27 Feb 2013 01:35:57 -0500 Received: from [222.73.24.84] (port=39826 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAacK-00034l-D4 for qemu-devel@nongnu.org; Wed, 27 Feb 2013 01:35:52 -0500 X-IronPort-AV: E=Sophos;i="4.84,746,1355068800"; d="scan'208";a="6778163" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 27 Feb 2013 14:33:09 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r1R6ZQFH007894; Wed, 27 Feb 2013 14:35:27 +0800 Received: from liguang.fnst.cn.fujitsu.com ([10.167.233.147]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013022714343592-451981 ; Wed, 27 Feb 2013 14:34:35 +0800 From: liguang To: aliguori@us.ibm.com, qemu-devel@nongnu.org Date: Wed, 27 Feb 2013 14:35:14 +0800 Message-Id: <1361946914-7712-1-git-send-email-lig.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.2.5 MIME-Version: 1.0 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/27 14:34:35, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/27 14:34:36 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: liguang Subject: [Qemu-devel] [PATCH] ui/gtk: fix gtk KEY definition incompatiable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org fix build errors like following: CC ui/gtk.o In file included from /usr/include/gtk-2.0/gtk/gtk.h:233, from ui/gtk.c:43: ui/gtk.c: In function ‘gd_vc_init’: ui/gtk.c:928: error: ‘GDK_KEY_2’ undeclared (first use in this function) ui/gtk.c:928: error: (Each undeclared identifier is reported only once ui/gtk.c:928: error: for each function it appears in.) ui/gtk.c: In function ‘gd_create_menus’: ui/gtk.c:1078: error: ‘GDK_KEY_f’ undeclared (first use in this function) ui/gtk.c:1087: error: ‘GDK_KEY_plus’ undeclared (first use in this function) ui/gtk.c:1093: error: ‘GDK_KEY_minus’ undeclared (first use in this function) ui/gtk.c:1099: error: ‘GDK_KEY_0’ undeclared (first use in this function) ui/gtk.c:1114: error: ‘GDK_KEY_g’ undeclared (first use in this function) ui/gtk.c:1124: error: ‘GDK_KEY_1’ undeclared (first use in this function) Signed-off-by: liguang --- ui/gtk.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index dcce36d..69454ce 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -74,6 +74,35 @@ #define MAX_VCS 10 +#ifndef GDK_KEY_0 +#define GDK_KEY_0 GDK_0 +#endif + +#ifndef GDK_KEY_1 +#define GDK_KEY_1 GDK_1 +#endif + +#ifndef GDK_KEY_2 +#define GDK_KEY_2 GDK_2 +#endif + +#ifndef GDK_KEY_f +#define GDK_KEY_f GDK_f +#endif + +#ifndef GDK_KEY_g +#define GDK_KEY_g GDK_g +#endif + +#ifndef GDK_KEY_plus +#define GDK_KEY_plus GDK_plus +#endif + +#ifndef GDK_KEY_minus +#define GDK_KEY_minus GDK_minus +#endif + + typedef struct VirtualConsole { GtkWidget *menu_item;