From patchwork Tue Jul 12 14:31:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 9225563 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E8516604DB for ; Tue, 12 Jul 2016 14:54:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA73727EED for ; Tue, 12 Jul 2016 14:54:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF7C827F9A; Tue, 12 Jul 2016 14:54:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3AFF527EED for ; Tue, 12 Jul 2016 14:54:35 +0000 (UTC) Received: from localhost ([::1]:41028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMz4y-0007LH-9s for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Jul 2016 10:54:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMyiw-00037X-2l for qemu-devel@nongnu.org; Tue, 12 Jul 2016 10:31:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMyiu-0001l5-2J for qemu-devel@nongnu.org; Tue, 12 Jul 2016 10:31:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50707) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMyit-0001ko-SM for qemu-devel@nongnu.org; Tue, 12 Jul 2016 10:31:43 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 747B0CD65E for ; Tue, 12 Jul 2016 14:31:43 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-29.ams2.redhat.com [10.36.116.29]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6CEVfhv016706 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 12 Jul 2016 10:31:43 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A4747113305E; Tue, 12 Jul 2016 16:31:34 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 12 Jul 2016 16:31:31 +0200 Message-Id: <1468333894-419-16-git-send-email-armbru@redhat.com> In-Reply-To: <1468333894-419-1-git-send-email-armbru@redhat.com> References: <1468333894-419-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 12 Jul 2016 14:31:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 15/18] libdecnumber: Don't error out on decNumberLocal.h re-inclusion X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP decNumberLocal.h errors out when it's included with its header guard defined. This catches multiple inclusions. Drop that. Including it multiple times is safe, and the compiler can do it efficiently. Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson --- include/libdecnumber/decNumberLocal.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/libdecnumber/decNumberLocal.h b/include/libdecnumber/decNumberLocal.h index c4d4015..12cf1d8 100644 --- a/include/libdecnumber/decNumberLocal.h +++ b/include/libdecnumber/decNumberLocal.h @@ -659,6 +659,4 @@ /* [end of format-dependent macros and constants] */ #endif -#else - #error decNumberLocal included more than once #endif