From 674ec686936fcde6977616dce2a68b42533ab2d7 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Tue, 19 Apr 2016 16:55:19 -0300 Subject: [PATCH] curses: curses_display_init() stub 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 6640348..f5fa9cb 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 a66d04a..c852d10 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); -- 2.7.4