From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlXIW-0004Kf-1Y for qemu-devel@nongnu.org; Mon, 25 Jul 2011 22:23:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QlXIV-0007ed-30 for qemu-devel@nongnu.org; Mon, 25 Jul 2011 22:23:03 -0400 From: TeLeMan Date: Tue, 26 Jul 2011 10:24:09 +0800 Message-Id: <1311647049-1896-1-git-send-email-geleman@gmail.com> Subject: [Qemu-devel] [PATCH] console: Don't expose the the ui module's functions when the module is not available. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-trivial@nongnu.org, TeLeMan , qemu-devel If there is no sdl support, the implement of sdl_display_init() is missing and its declaration should not be exposed. vnc, cocoa, curses and other ui modules are the same as sdl. Signed-off-by: TeLeMan --- console.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/console.h b/console.h index 67d1373..ede8bea 100644 --- a/console.h +++ b/console.h @@ -363,19 +363,24 @@ void qemu_console_copy(DisplayState *ds, int src_x, int src_y, int dst_x, int dst_y, int w, int h); /* sdl.c */ +#ifdef CONFIG_SDL void sdl_display_init(DisplayState *ds, int full_screen, int no_frame); +#endif /* cocoa.m */ +#ifdef CONFIG_COCOA void cocoa_display_init(DisplayState *ds, int full_screen); +#endif /* vnc.c */ +#ifdef CONFIG_VNC void vnc_display_init(DisplayState *ds); void vnc_display_close(DisplayState *ds); int vnc_display_open(DisplayState *ds, const char *display); void vnc_display_add_client(DisplayState *ds, int csock, int skipauth); int vnc_display_disable_login(DisplayState *ds); char *vnc_display_local_addr(DisplayState *ds); -#ifdef CONFIG_VNC + int vnc_display_password(DisplayState *ds, const char *password); int vnc_display_pw_expire(DisplayState *ds, time_t expires); void do_info_vnc_print(Monitor *mon, const QObject *data); @@ -401,6 +406,8 @@ static inline void do_info_vnc_print(Monitor *mon, const QObject *data) #endif /* curses.c */ +#ifdef CONFIG_CURSES void curses_display_init(DisplayState *ds, int full_screen); +#endif #endif -- 1.7.3.1.msysgit.0