* [Qemu-trivial] [PATCH] backends/baum.c: Fix compilation when SDL is not available.
@ 2014-03-21 21:29 ` Richard W.M. Jones
0 siblings, 0 replies; 6+ messages in thread
From: Richard W.M. Jones @ 2014-03-21 21:29 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, samuel.thibault
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) {
--
1.8.5.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH] backends/baum.c: Fix compilation when SDL is not available.
@ 2014-03-21 21:29 ` Richard W.M. Jones
0 siblings, 0 replies; 6+ messages in thread
From: Richard W.M. Jones @ 2014-03-21 21:29 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, samuel.thibault
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) {
--
1.8.5.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-trivial] [Qemu-devel] [PATCH] backends/baum.c: Fix compilation when SDL is not available.
2014-03-21 21:29 ` [Qemu-devel] " Richard W.M. Jones
@ 2014-03-21 21:52 ` Stefan Weil
-1 siblings, 0 replies; 6+ messages in thread
From: Stefan Weil @ 2014-03-21 21:52 UTC (permalink / raw)
To: Richard W.M. Jones, qemu-devel; +Cc: qemu-trivial, samuel.thibault
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>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] backends/baum.c: Fix compilation when SDL is not available.
@ 2014-03-21 21:52 ` Stefan Weil
0 siblings, 0 replies; 6+ messages in thread
From: Stefan Weil @ 2014-03-21 21:52 UTC (permalink / raw)
To: Richard W.M. Jones, qemu-devel; +Cc: qemu-trivial, samuel.thibault
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>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-trivial] [Qemu-devel] [PATCH] backends/baum.c: Fix compilation when SDL is not available.
2014-03-21 21:29 ` [Qemu-devel] " Richard W.M. Jones
@ 2014-03-24 18:49 ` Peter Maydell
-1 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2014-03-24 18:49 UTC (permalink / raw)
To: Richard W.M. Jones; +Cc: QEMU Trivial, QEMU Developers, samuel.thibault
On 21 March 2014 21:29, Richard W.M. Jones <rjones@redhat.com> wrote:
> 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>
Applied to master as a buildfix.
thanks
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] backends/baum.c: Fix compilation when SDL is not available.
@ 2014-03-24 18:49 ` Peter Maydell
0 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2014-03-24 18:49 UTC (permalink / raw)
To: Richard W.M. Jones; +Cc: QEMU Trivial, QEMU Developers, samuel.thibault
On 21 March 2014 21:29, Richard W.M. Jones <rjones@redhat.com> wrote:
> 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>
Applied to master as a buildfix.
thanks
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-03-24 18:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-21 21:29 [Qemu-trivial] [PATCH] backends/baum.c: Fix compilation when SDL is not available Richard W.M. Jones
2014-03-21 21:29 ` [Qemu-devel] " Richard W.M. Jones
2014-03-21 21:52 ` [Qemu-trivial] " Stefan Weil
2014-03-21 21:52 ` Stefan Weil
2014-03-24 18:49 ` [Qemu-trivial] " Peter Maydell
2014-03-24 18:49 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.