From patchwork Sun Apr 21 12:30:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 238213 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 794772C0121 for ; Sun, 21 Apr 2013 22:30:36 +1000 (EST) Received: from localhost ([::1]:45949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTtPe-0003KB-1G for incoming@patchwork.ozlabs.org; Sun, 21 Apr 2013 08:30:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTtPM-0003Jo-DK for qemu-devel@nongnu.org; Sun, 21 Apr 2013 08:30:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UTtPK-0007XB-2r for qemu-devel@nongnu.org; Sun, 21 Apr 2013 08:30:16 -0400 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:56722 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTtPJ-0007Vt-Sh for qemu-devel@nongnu.org; Sun, 21 Apr 2013 08:30:14 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UTtP9-0004IF-N9; Sun, 21 Apr 2013 13:30:03 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Sun, 21 Apr 2013 13:30:03 +0100 Message-Id: <1366547403-16480-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: qemu-trivial@nongnue.org, Anthony Liguori , Riku Voipio , patches@linaro.org Subject: [Qemu-devel] [PATCH] linux-user: fix compile error due to stray colon at end of #ifdef line X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Acked-By: Riku Voipio --- 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;