diff options
author | Eduardo Habkost <ehabkost@redhat.com> | 2016-04-19 16:55:19 -0300 |
---|---|---|
committer | Eduardo Habkost <ehabkost@redhat.com> | 2016-05-20 14:28:53 -0300 |
commit | 674ec686936fcde6977616dce2a68b42533ab2d7 (patch) | |
tree | 58b8982ff55bd7c0a530a6af58ee9371f4cf9a07 | |
parent | f8c75b2486d62bf1cbe824aa4c471118061bdcd3 (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.h | 9 | ||||
-rw-r--r-- | vl.c | 2 |
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); @@ -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); |