From e279e252ac7ea99b58eaf20d0aec4288de0386bb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 21 Mar 2014 21:29:37 +0000 Subject: [PATCH] backends/baum.c: Fix compilation when SDL is not available. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit backends/baum.c: In function ‘chr_baum_init’: backends/baum.c:569:64: error: missing binary operator before token "(" #if defined(CONFIG_SDL) && SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0) ^ backends/baum.c:598:64: error: missing binary operator before token "(" #if defined(CONFIG_SDL) && SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0) Signed-off-by: Richard W.M. Jones Message-id: 1395437377-5779-1-git-send-email-rjones@redhat.com Reviewed-by: Stefan Weil Signed-off-by: Peter Maydell --- backends/baum.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/backends/baum.c b/backends/baum.c index 665107fa9c..759003f623 100644 --- a/backends/baum.c +++ b/backends/baum.c @@ -566,8 +566,10 @@ CharDriverState *chr_baum_init(void) BaumDriverState *baum; CharDriverState *chr; brlapi_handle_t *handle; -#if defined(CONFIG_SDL) && SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0) +#if defined(CONFIG_SDL) +#if SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0) SDL_SysWMinfo info; +#endif #endif int tty; @@ -595,12 +597,14 @@ CharDriverState *chr_baum_init(void) goto fail; } -#if defined(CONFIG_SDL) && SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0) +#if defined(CONFIG_SDL) +#if SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0) memset(&info, 0, sizeof(info)); SDL_VERSION(&info.version); if (SDL_GetWMInfo(&info)) tty = info.info.x11.wmwindow; else +#endif #endif tty = BRLAPI_TTY_DEFAULT; -- 2.39.2