aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2016-04-19 16:55:19 -0300
committerEduardo Habkost <ehabkost@redhat.com>2016-05-20 14:28:53 -0300
commit674ec686936fcde6977616dce2a68b42533ab2d7 (patch)
tree58b8982ff55bd7c0a530a6af58ee9371f4cf9a07
parentf8c75b2486d62bf1cbe824aa4c471118061bdcd3 (diff)
curses: curses_display_init() stub
One less #ifdef in vl.c. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
-rw-r--r--include/ui/console.h9
-rw-r--r--vl.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/include/ui/console.h b/include/ui/console.h
index 6640348ee8..f5fa9cbd7c 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -466,7 +466,16 @@ static inline char *vnc_display_local_addr(const char *id)
#endif
/* curses.c */
+#ifdef CONFIG_CURSES
void curses_display_init(DisplayState *ds, int full_screen);
+#else
+static inline void curses_display_init(DisplayState *ds, int full_screen)
+{
+ /* This must never be called if CONFIG_CURSES is disabled */
+ error_report("curses support is disabled");
+ abort();
+}
+#endif
/* input.c */
int index_from_key(const char *key, size_t key_length);
diff --git a/vl.c b/vl.c
index a66d04ae4e..c852d105d9 100644
--- a/vl.c
+++ b/vl.c
@@ -4540,11 +4540,9 @@ int main(int argc, char **argv, char **envp)
case DT_NOGRAPHIC:
(void)ds; /* avoid warning if no display is configured */
break;
-#if defined(CONFIG_CURSES)
case DT_CURSES:
curses_display_init(ds, full_screen);
break;
-#endif
#if defined(CONFIG_SDL)
case DT_SDL:
sdl_display_init(ds, full_screen, no_frame);