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: 16281 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AC30520F45 for ; Sun, 21 Apr 2013 12:30:54 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id m17sf1454254vca.9 for ; Sun, 21 Apr 2013 05:30:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :from:to:cc:subject:date:message-id:x-mailer:mime-version :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type:content-transfer-encoding; bh=73l7Un0GrXlZN5QAHk2YY3f5E/Cy32seWRQPT6TZRCU=; b=SsA+3HmjWma1kWzfwewVm7p859rMeazMq437I28nDe+/T1MWGvNcHrJQXBMh1Y5uvi 2zd4QOSCc8xzUg5jPqv4aOHHOZuzVstwxi1iBp+oRced2GFO1HQ6F8JHhuvL1AjmHHur tQxAaPylFssPhtQHo13CCZbaxbRW/qyuu8XAAwXyjnVhItBSxiJ75mDUjjg7Q7/COqlB guasxjJttNhcThT/rqlDJlfjEO9obAzGH57Ny53wEm303MfH3z1C1JdJwP6btlNBJoeP XgCRp2Kcd/e2ZwD3bQzd8rU48kxPsnITK9vOBl9BTNeaLcCyCOQ/hvtxTj3R2/UdF7AV n0Hg== X-Received: by 10.224.178.205 with SMTP id bn13mr16784021qab.3.1366547410393; Sun, 21 Apr 2013 05:30:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.63.101 with SMTP id f5ls184345qes.1.gmail; Sun, 21 Apr 2013 05:30:10 -0700 (PDT) X-Received: by 10.58.232.98 with SMTP id tn2mr16101134vec.57.1366547410247; Sun, 21 Apr 2013 05:30:10 -0700 (PDT) Received: from mail-vb0-x233.google.com (mail-vb0-x233.google.com [2607:f8b0:400c:c02::233]) by mx.google.com with ESMTPS id ow6si13893678vcb.17.2013.04.21.05.30.10 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 21 Apr 2013 05:30:10 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::233 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::233; Received: by mail-vb0-f51.google.com with SMTP id x19so5123440vbf.10 for ; Sun, 21 Apr 2013 05:30:10 -0700 (PDT) X-Received: by 10.52.71.4 with SMTP id q4mr13893789vdu.8.1366547409798; Sun, 21 Apr 2013 05:30:09 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp40014veb; Sun, 21 Apr 2013 05:30:09 -0700 (PDT) X-Received: by 10.181.11.164 with SMTP id ej4mr953688wid.29.1366547408048; Sun, 21 Apr 2013 05:30:08 -0700 (PDT) Received: from mnementh.archaic.org.uk (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]) by mx.google.com with ESMTPS id vy4si7873675wjc.62.2013.04.21.05.30.07 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 21 Apr 2013 05:30:07 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; 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 Cc: patches@linaro.org, qemu-trivial@nongnue.org, Anthony Liguori , Riku Voipio Subject: [PATCH] linux-user: fix compile error due to stray colon at end of #ifdef line 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-Gm-Message-State: ALoCoQlkMG9kB1pOvLGsAJtr0y3g8eehc3EkPqIrSWO/QOP+SZ+Rry2ptMiaOSxHA6GnU3gWAga0 X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::233 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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;