From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrZZM-000551-26 for qemu-devel@nongnu.org; Sun, 10 May 2015 18:19:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YrZZL-0007h5-8B for qemu-devel@nongnu.org; Sun, 10 May 2015 18:19:31 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34107) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrZZL-0007dd-0n for qemu-devel@nongnu.org; Sun, 10 May 2015 18:19:31 -0400 From: Peter Maydell Date: Sun, 10 May 2015 23:19:18 +0100 Message-Id: <1431296361-16981-4-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1431296361-16981-1-git-send-email-peter.maydell@linaro.org> References: <1431296361-16981-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 3/6] ui/cocoa: openPanelDidEnd returnCode should be NSInteger, not int List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Programmingkid , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf , patches@linaro.org The type for openPanelDidEnd's returnCode argument should be NSInteger, not int. This only matters for the OSX 10.5 code path where we pass the method directly to an OSX function to call. Signed-off-by: Peter Maydell --- ui/cocoa.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index f6c5fb4..563ea47 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -787,7 +787,7 @@ QemuCocoaView *cocoaView; { } - (void)startEmulationWithArgc:(int)argc argv:(char**)argv; -- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo; +- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo; - (void)doToggleFullScreen:(id)sender; - (void)toggleFullScreen:(id)sender; - (void)showQEMUDoc:(id)sender; @@ -890,7 +890,7 @@ QemuCocoaView *cocoaView; exit(status); } -- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo +- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { COCOA_DEBUG("QemuCocoaAppController: openPanelDidEnd\n"); -- 2.2.1