From patchwork Wed Nov 14 19:29:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 151114 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6086050ljp; Wed, 14 Nov 2018 11:29:47 -0800 (PST) X-Google-Smtp-Source: AJdET5fsCQOcOhObgb50fY4Dmn/F78XxbJsb1v3ansWImw15TB9daqKwhbqAVFNL/1TzXXx//oxi X-Received: by 2002:a0c:9dc6:: with SMTP id p6mr3245475qvf.217.1542223787439; Wed, 14 Nov 2018 11:29:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542223787; cv=none; d=google.com; s=arc-20160816; b=09ExtBmkCsF5a23LRU/uABKUznwcyGlhM4m7gOmTyL8P+0FBdTTkPRhqfd4hYGE+OH vFqAvYpDF5jHxAEuUy3Tk8nXQcWF+0b9AdL1vBEoyjN8k4Nh8GS8oVocTNskEGgaJViC +Aq0Kx3maHv+oKCHl9Nbw6rmZlZMXTfOOY5t4K/AH+hFCtsBFvAeG4362qSoie3/08X4 XJCqvkMj0BIJ/RFwWQfFr63RdFrk9upHS67XScKtlqXj7w1q3pdDlDg0Zrw8HppdZdy9 ZjVjc6fGvMOXexdgNC1+axqen/Yh3QaoBD+FkKCzLMBWbYIWecA6I1j61XiE6hKHh8ii +zww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature; bh=xibdzSEg9XUT2WxS5uoMnZ+qxrUAISOaV5eULHCdfqE=; b=XXmTe1Rin6RVUkpj2KiPhGl2Z/ByqaTFatsCVsTpdDpM9fHzx45hNgziVJk3xsSek7 k5zmi+PUlrlBjlm1XA68Sd+eR7mNrM09VH7zLT6odwcOMZNJpKVLUpr/O6x0CEUXXhdx FpMb8488zrrHt2XUkWbvCtOXALFNvRQIQ7jFnOSCAhhcLI1SdgD4IkHm1e/YmuXeQGYh 6VEBVa35h5rSzKNEd27WzXMXP1HUK1eCiWdoJxIDCDSESsD57J/I0+nIX2utvZJGfzmS VoaalIwnZW0mGhG9daW+Sp6ZbepYODY2Vj5rsLUDbaLzuvZCkAIZIpFw7B7VGap9NQz9 IIGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=UMGGmHNS; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="grub-devel-bounces+patch=linaro.org@gnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h123si1898544qkf.66.2018.11.14.11.29.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 14 Nov 2018 11:29:47 -0800 (PST) Received-SPF: pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=UMGGmHNS; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="grub-devel-bounces+patch=linaro.org@gnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN0rC-0000lW-ML for patch@linaro.org; Wed, 14 Nov 2018 14:29:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN0qw-0000jY-Ie for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN0qs-0004r2-4y for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:30 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:36902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN0qq-0004pq-Ib for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:26 -0500 Received: by mail-wm1-x343.google.com with SMTP id p2-v6so15744959wmc.2 for ; Wed, 14 Nov 2018 11:29:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=q1pSPo5xkjiiyDB6pmm9a5o33fy3CrrRt+c9fBt9G3o=; b=UMGGmHNSsw03dQGI8DqTAtpDR2VB45DZUmxXtRcx8JMx2gIZG5djl/2M0uDydhQgWk SftHav10HAokwG1QOFTgCE6uPdBBkrjsTZJeXUtZKPJCYPqGBLsh9b03pGqi2N47EhWD +Lt6McZxFSyoBqRM2yZj0/e1bUj0pgiLcokWw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=q1pSPo5xkjiiyDB6pmm9a5o33fy3CrrRt+c9fBt9G3o=; b=Qe5I9ci8W66eR9YQK3RlSyO1D5924lCka79ooGrR526czEO/CiNLb6SAPiRp4mA4G6 zB69K/oRfCUr0KIUn3io6G9rkp339m9+g/OhWsUUY6U61A79XPf9nC/Bj9l9QcSY1k9D 930uPbKAVW2jN0K0x7cBI0sybH8NhYKvpNSLJo3Fium9yeHtFx3VRny4JDluLjXBB/0P jWOuDwiWYp3tSXdY6OEXJlWcgw0bi/nPvTeVc9BsAoTo4Cf+iqDAhz9on+dLxHDV1k8S WzHP36hrlUMVCfsi/5sXTVSv1LTo5tpBFMZlanCMi8jc/BS8eDnD6O13ydlzCf38g59l c7zQ== X-Gm-Message-State: AGRZ1gLugRRlfkG26UXTEWGxgZ1YC78arGVIU0/ldnrHMCK3jkx0BfeY 81968jvb22DHuH+D8GcWHvW2Vk9M44bPew== X-Received: by 2002:a1c:1c88:: with SMTP id c130-v6mr2993183wmc.115.1542223762824; Wed, 14 Nov 2018 11:29:22 -0800 (PST) Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id 127sm6260278wmb.4.2018.11.14.11.29.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 11:29:21 -0800 (PST) From: Leif Lindholm To: grub-devel@gnu.org Subject: [PATCH 1/5] grub/verify.h: add include guard Date: Wed, 14 Nov 2018 19:29:15 +0000 Message-Id: <20181114192919.24655-2-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181114192919.24655-1-leif.lindholm@linaro.org> References: <20181114192919.24655-1-leif.lindholm@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The development of GNU GRUB Cc: dkiper@net-space.pl MIME-Version: 1.0 Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org Sender: "Grub-devel" verify.h was added without include guards. This means compiling anything including both grub/verify.h and grub/lib/cmdline.h fails (at least loader/arm64/linux.c. Add the necessary include guard. Signed-off-by: Leif Lindholm --- include/grub/verify.h | 5 +++++ 1 file changed, 5 insertions(+) -- 2.11.0 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel diff --git a/include/grub/verify.h b/include/grub/verify.h index 79022b422..dedb14a1d 100644 --- a/include/grub/verify.h +++ b/include/grub/verify.h @@ -16,6 +16,9 @@ * along with GRUB. If not, see . */ +#ifndef GRUB_VERIFY_HEADER +#define GRUB_VERIFY_HEADER + #include #include @@ -76,3 +79,5 @@ grub_verifier_unregister (struct grub_file_verifier *ver) grub_err_t grub_verify_string (char *str, enum grub_verify_string_type type); + +#endif /* ! GRUB_VERIFY_HEADER */