From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asbkP-0002oj-SL for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1asbkP-0007c0-1w for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51909) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asbkO-0007bv-Sm for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:44 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 75E6B12BBD for ; Tue, 19 Apr 2016 19:55:44 +0000 (UTC) From: Eduardo Habkost Date: Tue, 19 Apr 2016 16:55:21 -0300 Message-Id: <1461095728-22055-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1461095728-22055-1-git-send-email-ehabkost@redhat.com> References: <1461095728-22055-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH for-2.7 v3 05/12] cocoa: cocoa_display_init() stub List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Marcel Apfelbaum One less #ifdef in vl.c. Signed-off-by: Eduardo Habkost --- Changes v1 -> v2: * Move stub file to stubs/ui/ Changes v2 -> v3: * Fix typo (CONFIG_COCA) on comment * Move stub to header file --- include/ui/console.h | 9 +++++++++ vl.c | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index f3e749d..7ac997f 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -442,7 +442,16 @@ static inline void sdl_display_init(DisplayState *ds, int full_screen, #endif /* cocoa.m */ +#ifdef CONFIG_COCOA void cocoa_display_init(DisplayState *ds, int full_screen); +#else +static inline void cocoa_display_init(DisplayState *ds, int full_screen) +{ + /* This must never be called if CONFIG_COCOA is disabled */ + error_report("Cocoa support is disabled"); + abort(); +} +#endif /* vnc.c */ void vnc_display_init(const char *id); diff --git a/vl.c b/vl.c index 51403c1..41cdb68 100644 --- a/vl.c +++ b/vl.c @@ -4545,11 +4545,9 @@ int main(int argc, char **argv, char **envp) case DT_SDL: sdl_display_init(ds, full_screen, no_frame); break; -#if defined(CONFIG_COCOA) case DT_COCOA: cocoa_display_init(ds, full_screen); break; -#endif #if defined(CONFIG_GTK) case DT_GTK: gtk_display_init(ds, full_screen, grab_on_hover); -- 2.1.0