From patchwork Wed Jan 6 22:47:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 42357 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 08D68B6F06 for ; Thu, 7 Jan 2010 10:00:43 +1100 (EST) Received: from localhost ([127.0.0.1]:33641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSern-0006Du-VZ for incoming@patchwork.ozlabs.org; Wed, 06 Jan 2010 18:00:40 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSeg1-0008B7-CH for qemu-devel@nongnu.org; Wed, 06 Jan 2010 17:48:29 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSefw-00084r-UD for qemu-devel@nongnu.org; Wed, 06 Jan 2010 17:48:28 -0500 Received: from [199.232.76.173] (port=50127 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSefw-00084Z-GY for qemu-devel@nongnu.org; Wed, 06 Jan 2010 17:48:24 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:50545) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NSefw-0005JU-1C for qemu-devel@nongnu.org; Wed, 06 Jan 2010 17:48:24 -0500 Received: from smtp05.web.de (fmsmtp05.dlan.cinetic.de [172.20.4.166]) by fmmailgate03.web.de (Postfix) with ESMTP id 59D5F13B9EC8E for ; Wed, 6 Jan 2010 23:47:23 +0100 (CET) Received: from [84.148.52.231] (helo=localhost.localdomain) by smtp05.web.de with asmtp (WEB.DE 4.110 #314) id 1NSeew-0001R8-01; Wed, 06 Jan 2010 23:47:22 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 6 Jan 2010 23:47:07 +0100 Message-Id: <1262818037-926-2-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.6.5.3 In-Reply-To: <1262818037-926-1-git-send-email-andreas.faerber@web.de> References: <1262818037-926-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1+kGS/dEtzvHAt/dlPq081jMe4wTvhqJvZRWs/R 2FIbxvnfWnoreiPMIRZXc1MgElP5MsVd8h+IS4ohVjq5vTmW5y EKyAjx1b8aPA0o8HwCoQ== X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH v2 RESEND 01/11] Cocoa: ppc64 host support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fix integer usage in the Cocoa backend: NSInteger is long on LP64. http://developer.apple.com/mac/library/documentation/Cocoa/Reference/ApplicationKit/Classes/NSView_Class/Reference/NSView.html#//apple_ref/doc/uid/20000014-BBCFHHCD This makes the graphical display show up on a ppc64 host. v3: - Confine NSInteger to Mac OS X v10.5 and later Signed-off-by: Andreas Färber --- cocoa.m | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/cocoa.m b/cocoa.m index 55ff2b4..989efd5 100644 --- a/cocoa.m +++ b/cocoa.m @@ -28,6 +28,10 @@ #include "console.h" #include "sysemu.h" +#ifndef MAC_OS_X_VERSION_10_5 +#define MAC_OS_X_VERSION_10_5 1050 +#endif + //#define DEBUG @@ -337,7 +341,11 @@ int cocoa_keycode_to_qemu(int keycode) } else { // selective drawing code (draws only dirty rectangles) (OS X >= 10.4) const NSRect *rectList; +#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) + NSInteger rectCount; +#else int rectCount; +#endif int i; CGImageRef clipImageRef; CGRect clipRect;