| Message ID | 1366547403-16480-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 7edd2cf1a2eace84e3f8753e912449ae8871802f |
| Headers | show |
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 > >
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
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
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;
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(-)