Patchwork linux-user: fix compile error due to stray colon at end of #ifdef line

login
register
mail settings
Submitter Peter Maydell
Date April 21, 2013, 12:30 p.m.
Message ID <1366547403-16480-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/238213/
State New
Headers show

Comments

Peter Maydell - April 21, 2013, 12:30 p.m.
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(-)
Peter Maydell - April 21, 2013, 12:46 p.m.
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
>
>
Riku Voipio - April 22, 2013, 6:38 a.m.
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
Stefan Hajnoczi - April 26, 2013, 9:57 a.m.
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

Patch

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;