diff mbox

[for-2.7,v3,05/12] cocoa: cocoa_display_init() stub

Message ID 1461095728-22055-6-git-send-email-ehabkost@redhat.com
State New
Headers show

Commit Message

Eduardo Habkost April 19, 2016, 7:55 p.m. UTC 
One less #ifdef in vl.c.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
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 mbox

Patch

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);