From patchwork Tue Feb 20 18:03:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 128956 Delivered-To: patches@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4910300ljc; Tue, 20 Feb 2018 10:03:34 -0800 (PST) X-Google-Smtp-Source: AH8x225+VGKduB+YcdprShwN7v2AD3ogB3hVgQhPLwzr1XDD/AyjBqHTurUygs93UxC2SHdRsM1j X-Received: by 10.223.128.104 with SMTP id 95mr455705wrk.139.1519149814014; Tue, 20 Feb 2018 10:03:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519149814; cv=none; d=google.com; s=arc-20160816; b=o2BXVMlKOysY0khf3lJKzMun5VH4jE2x4RBoayQciV424EcMOyCCunC4FaD8JpDZnx Wrp+q7FvgldbrQ14yFKjDLFFHVdAcBmqx+oeApCp5MGgdbqIVdX5nwmkAn33CLz5Lduf oaC5HOzqfOCHqLcnvtWGbc1LPRgXhDpshsf9RyLjvxDjYmBdZeXZ/0bM/eFe8+OS/9uZ DPZEnH3556Qd/vySg9v4564woqBrRf5LDrTsAEs9oHROlWBr6ga/eJgo1+PqWio5HaE9 t2T656RUaMze3bOHMQxf7cKV8K6CmIa0eMOHGEe1bDFDj3K1c+lq3LjmLpCDLyqVZd3R tXXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=O3BrtQx4SO5LOAQKzMgLzcMX/jSOw42djrxN0OBQ6Eo=; b=Hdtbbosu1JpZZPKavJkzjVwpvmebzmq1Ris6QgqWZ46gzVrRk1Ra0MT51Kqpn7JC76 boUjQCc1NovWr825RwGnWBJDoUEasjhRjIr9t9MQaU8pf0Q2Hvolys3K5YpgI/bfiMoM GlA2vEMIGlyD53HPU0RngCoa6cKWAoqDh9TeJwM30DcFtJ2hdjhJa4LCQgkFEfJWkWpN BfekJzU7C0+txEHqzjTklzOpJFMgd2h7Q1BM3lXdLMYCwElpDTEXXKbAyM4DMUNKqxL0 7ivQdqnNwBVGM/TGTNXDSjL0+O6ZzTmvcy+mM+0+BPEA1NYPIDnc/AWn8DyrDuO4Yt1m kThA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id 76si15949933wmy.183.2018.02.20.10.03.33 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Feb 2018 10:03:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1eoCGL-0008SP-HX; Tue, 20 Feb 2018 18:03:33 +0000 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 10/19] include/hw/or-irq.h: Add missing include guard Date: Tue, 20 Feb 2018 18:03:16 +0000 Message-Id: <20180220180325.29818-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180220180325.29818-1-peter.maydell@linaro.org> References: <20180220180325.29818-1-peter.maydell@linaro.org> The or-irq.h header file is missing the customary guard against multiple inclusion, which means compilation fails if it gets included twice. Fix the omission. Signed-off-by: Peter Maydell --- include/hw/or-irq.h | 5 +++++ 1 file changed, 5 insertions(+) -- 2.16.1 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson diff --git a/include/hw/or-irq.h b/include/hw/or-irq.h index fd900fcf19..3f6fc1b58a 100644 --- a/include/hw/or-irq.h +++ b/include/hw/or-irq.h @@ -22,6 +22,9 @@ * THE SOFTWARE. */ +#ifndef HW_OR_IRQ_H +#define HW_OR_IRQ_H + #include "hw/irq.h" #include "hw/sysbus.h" #include "qom/object.h" @@ -41,3 +44,5 @@ struct OrIRQState { bool levels[MAX_OR_LINES]; uint16_t num_lines; }; + +#endif