* [Qemu-devel] [PATCH] linux-user: fix compile error due to stray colon at end of #ifdef line
@ 2013-04-21 12:30 Peter Maydell
2013-04-21 12:46 ` Peter Maydell
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Peter Maydell @ 2013-04-21 12:30 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Anthony Liguori, Riku Voipio, patches
Remove a stray colon from the end of a #ifdef line. Some versions
of gcc complain about this:
linux-user/syscall.c: In function ‘do_syscall’:
linux-user/syscall.c:7606:28: error: extra tokens at end of #ifdef directive [-Werror]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
Obviously this is 1.5 material; don't care whether it goes through
linux-user or qemu-trivial or direct commit.
linux-user/syscall.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index c705960..30e93bc 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7603,7 +7603,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
#endif
#else
case TARGET_NR_sendfile:
-#ifdef TARGET_NR_sendfile64:
+#ifdef TARGET_NR_sendfile64
case TARGET_NR_sendfile64:
#endif
goto unimplemented;
--
1.7.11.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] linux-user: fix compile error due to stray colon at end of #ifdef line
2013-04-21 12:30 [Qemu-devel] [PATCH] linux-user: fix compile error due to stray colon at end of #ifdef line Peter Maydell
@ 2013-04-21 12:46 ` Peter Maydell
2013-04-22 6:38 ` Riku Voipio
2013-04-26 9:57 ` Stefan Hajnoczi
2 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2013-04-21 12:46 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Anthony Liguori, Riku Voipio, patches
oops, typo'd qemu-trivial address...
-- PMM
On 21 April 2013 13:30, Peter Maydell <peter.maydell@linaro.org> wrote:
> Remove a stray colon from the end of a #ifdef line. Some versions
> of gcc complain about this:
> linux-user/syscall.c: In function ‘do_syscall’:
> linux-user/syscall.c:7606:28: error: extra tokens at end of #ifdef directive [-Werror]
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> Obviously this is 1.5 material; don't care whether it goes through
> linux-user or qemu-trivial or direct commit.
>
> linux-user/syscall.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index c705960..30e93bc 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -7603,7 +7603,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
> #endif
> #else
> case TARGET_NR_sendfile:
> -#ifdef TARGET_NR_sendfile64:
> +#ifdef TARGET_NR_sendfile64
> case TARGET_NR_sendfile64:
> #endif
> goto unimplemented;
> --
> 1.7.11.4
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] linux-user: fix compile error due to stray colon at end of #ifdef line
2013-04-21 12:30 [Qemu-devel] [PATCH] linux-user: fix compile error due to stray colon at end of #ifdef line Peter Maydell
2013-04-21 12:46 ` Peter Maydell
@ 2013-04-22 6:38 ` Riku Voipio
2013-04-26 9:57 ` Stefan Hajnoczi
2 siblings, 0 replies; 4+ messages in thread
From: Riku Voipio @ 2013-04-22 6:38 UTC (permalink / raw)
To: Peter Maydell
Cc: qemu-trivial, Anthony Liguori, Riku Voipio, qemu-devel, patches
On Sun, Apr 21, 2013 at 01:30:03PM +0100, Peter Maydell wrote:
> Remove a stray colon from the end of a #ifdef line. Some versions
> of gcc complain about this:
> linux-user/syscall.c: In function ‘do_syscall’:
> linux-user/syscall.c:7606:28: error: extra tokens at end of #ifdef directive [-Werror]
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-By: Riku Voipio <riku.voipio@linaro.org>
> ---
> Obviously this is 1.5 material; don't care whether it goes through
> linux-user or qemu-trivial or direct commit.
>
> linux-user/syscall.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index c705960..30e93bc 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -7603,7 +7603,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
> #endif
> #else
> case TARGET_NR_sendfile:
> -#ifdef TARGET_NR_sendfile64:
> +#ifdef TARGET_NR_sendfile64
> case TARGET_NR_sendfile64:
> #endif
> goto unimplemented;
> --
> 1.7.11.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] linux-user: fix compile error due to stray colon at end of #ifdef line
2013-04-21 12:30 [Qemu-devel] [PATCH] linux-user: fix compile error due to stray colon at end of #ifdef line Peter Maydell
2013-04-21 12:46 ` Peter Maydell
2013-04-22 6:38 ` Riku Voipio
@ 2013-04-26 9:57 ` Stefan Hajnoczi
2 siblings, 0 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2013-04-26 9:57 UTC (permalink / raw)
To: Peter Maydell
Cc: qemu-trivial, Anthony Liguori, Riku Voipio, qemu-devel, patches
On Sun, Apr 21, 2013 at 01:30:03PM +0100, Peter Maydell wrote:
> Remove a stray colon from the end of a #ifdef line. Some versions
> of gcc complain about this:
> linux-user/syscall.c: In function ‘do_syscall’:
> linux-user/syscall.c:7606:28: error: extra tokens at end of #ifdef directive [-Werror]
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> Obviously this is 1.5 material; don't care whether it goes through
> linux-user or qemu-trivial or direct commit.
>
> linux-user/syscall.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches
Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-04-26 9:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-21 12:30 [Qemu-devel] [PATCH] linux-user: fix compile error due to stray colon at end of #ifdef line Peter Maydell
2013-04-21 12:46 ` Peter Maydell
2013-04-22 6:38 ` Riku Voipio
2013-04-26 9:57 ` Stefan Hajnoczi
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.