From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3t8T-00027I-5k for qemu-devel@nongnu.org; Fri, 20 May 2016 18:43:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3r2k-00018Y-MT for qemu-devel@nongnu.org; Fri, 20 May 2016 16:29:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52517) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3r2k-00018T-H4 for qemu-devel@nongnu.org; Fri, 20 May 2016 16:29:10 -0400 From: Eduardo Habkost Date: Fri, 20 May 2016 17:28:29 -0300 Message-Id: <1463776121-13529-10-git-send-email-ehabkost@redhat.com> In-Reply-To: <1463776121-13529-1-git-send-email-ehabkost@redhat.com> References: <1463776121-13529-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PULL 09/21] cocoa: cocoa_display_init() stub List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , "Michael S. Tsirkin" , Marcel Apfelbaum , qemu-devel@nongnu.org One less #ifdef in vl.c. Signed-off-by: Eduardo Habkost --- 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 d5df442..0648705 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.5.5