From patchwork Sun Nov 5 10:06:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 834319 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-465960-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="UnntSaIk"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yVBDq0FF7z9t34 for ; Sun, 5 Nov 2017 21:06:50 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :subject:to:cc:message-id:date:mime-version:content-type; q=dns; s=default; b=TrwPALbNaVbzZINtCP9GycCwgsbx+IvNzSq3zOCpHTzARv8AXC 1uY4K2wQVypnRreQXlpcUNJTjePZwgsKBi9lvdvj5z9LhuLo+mVXc8shgRocohyh LYJ9+jASOZ+6yldfB2VoNOoVskH7U83/Mq4/xmJj3KkUFn58EtQxSUNT8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :subject:to:cc:message-id:date:mime-version:content-type; s= default; bh=R9wo/H9OSwxG+PWwRLGotYB1oJM=; b=UnntSaIkUwopyjVYk17H M7GJr+Zj9u97HLWUqDXTENx1LrPUNMx8ijvTjbjNmghhsOvDhCfYGdKNjLQEjuR9 JDhe6HbJeK8O/LxNlQE5TKZSElrrd3rw05kMJXNOspZNX9UwSUprP9A1H/BtVzLP CdPN+c57UufaOsP0BpdEiPk= Received: (qmail 114197 invoked by alias); 5 Nov 2017 10:06:40 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 114185 invoked by uid 89); 5 Nov 2017 10:06:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=Hx-languages-length:845 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 05 Nov 2017 10:06:38 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-MBX-04.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1eBHp7-0000Su-8d from Tom_deVries@mentor.com ; Sun, 05 Nov 2017 02:06:37 -0800 Received: from [172.30.72.166] (137.202.0.87) by SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Sun, 5 Nov 2017 10:06:33 +0000 From: Tom de Vries Subject: [PATCH 6/7] [libcpp, committed] Remove semicolon after do {} while (0) in BUF_APPEND To: GCC Patches CC: David Malcolm Message-ID: Date: Sun, 5 Nov 2017 11:06:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) Hi, this patch removes a semicolon after "do {} while (0)" in BUF_APPEND. This allows the macro to be used in if-then-elses without curly braces. Committed as obvious. Thanks, - Tom 2017-11-02 Tom de Vries PR other/82784 * lex.c (BUF_APPEND): Remove semicolon after "do {} while (0)". Signed-off-by: Tom de Vries --- libcpp/lex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcpp/lex.c b/libcpp/lex.c index 40ff801..9164a07 100644 --- a/libcpp/lex.c +++ b/libcpp/lex.c @@ -1647,7 +1647,7 @@ lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base, (const uchar *)(STR), (LEN)); \ temp_buffer_len += (LEN); \ } \ - } while (0); + } while (0) orig_base = base; ++cur;