@@ -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);
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: * Move stub to header file --- include/ui/console.h | 9 +++++++++ vl.c | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-)