Re: [Qemu-trivial] [Qemu-devel] [PATCH] backends/baum.c: Fix compilation when SDL is not available.

[Stefan Weil <sw@weilnetz.de>]

Am 21.03.2014 22:29, schrieb Richard W.M. Jones:
> 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 <rjones@redhat.com>
> ---
>  backends/baum.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/backends/baum.c b/backends/baum.c
> index 665107f..759003f 100644
> --- a/backends/baum.c
> +++ b/backends/baum.c
> @@ -566,9 +566,11 @@ 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;
>  
>      baum = g_malloc0(sizeof(BaumDriverState));
> @@ -595,13 +597,15 @@ 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;
>  
>      if (brlapi__enterTtyMode(handle, tty, NULL) == -1) {
> 

Reviewed-by: Stefan Weil <sw@weilnetz.de>