From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlXSQ-0005Wg-Kh for qemu-devel@nongnu.org; Mon, 25 Jul 2011 22:33:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QlXSP-0000fC-N8 for qemu-devel@nongnu.org; Mon, 25 Jul 2011 22:33:18 -0400 Message-ID: <4E2E274B.9020608@us.ibm.com> Date: Mon, 25 Jul 2011 21:32:43 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1311647049-1896-1-git-send-email-geleman@gmail.com> In-Reply-To: <1311647049-1896-1-git-send-email-geleman@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [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: TeLeMan Cc: qemu-trivial@nongnu.org, qemu-devel On 07/25/2011 09:24 PM, TeLeMan wrote: > 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 Nack. There's no harm in exposing these and it avoids cluttered #ifdefs. Regards, Anthony Liguori > --- > 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