From patchwork Tue Nov 23 22:40:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 14735 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id A7511BF415 for ; Tue, 23 Nov 2021 22:40:32 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2A91B604F9; Tue, 23 Nov 2021 23:40:28 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="NGuImxCu"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7E24A60121 for ; Tue, 23 Nov 2021 23:40:21 +0100 (CET) Received: from Monstersaurus.ksquared.org.uk.beta.tailscale.net (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 36AD0F95; Tue, 23 Nov 2021 23:40:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1637707221; bh=PVSnTH2xPr8zG61fjaqufX7gEYVrpN/7MVkm/wrAtTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NGuImxCuOc7WDUtMcqd8fOBHXSA6ReHWUIgzSfArTop71GeEKhkBGPD6GoQ10z48g nN5NmyZfr890vfnWdpcadJwLwOkGxAh61yn6QZOP2auzU1GRtBoDilF7HhzIgEDwpI 2fNR8qYd0SLEU8Ja2UEewT/lKMIEStPd8HCaAR1w= From: Kieran Bingham To: libcamera devel Date: Tue, 23 Nov 2021 22:40:04 +0000 Message-Id: <20211123224015.3619282-5-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211123224015.3619282-1-kieran.bingham@ideasonboard.com> References: <20211123224015.3619282-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 04/15] libcamera: ipa: Convert to pragma once X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Remove the verbose #ifndef/#define/#endif pattern for maintaining header idempotency, and replace it with a simple #pragma once. This simplifies the headers, and prevents redundant changes when header files get moved. Signed-off-by: Kieran Bingham --- include/libcamera/ipa/ipa_controls.h | 6 ++---- include/libcamera/ipa/ipa_interface.h | 6 ++---- include/libcamera/ipa/ipa_module_info.h | 6 ++---- include/libcamera/ipa/raspberrypi.h | 6 ++---- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/include/libcamera/ipa/ipa_controls.h b/include/libcamera/ipa/ipa_controls.h index eec34d9267af..da1a759618e0 100644 --- a/include/libcamera/ipa/ipa_controls.h +++ b/include/libcamera/ipa/ipa_controls.h @@ -4,8 +4,8 @@ * * ipa_controls.h - IPA Control handling */ -#ifndef __LIBCAMERA_IPA_CONTROLS_H__ -#define __LIBCAMERA_IPA_CONTROLS_H__ + +#pragma once #include @@ -50,5 +50,3 @@ struct ipa_control_info_entry { #ifdef __cplusplus } #endif - -#endif /* __LIBCAMERA_IPA_CONTROLS_H__ */ diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h index 1590584c1fb4..50ca0e7b0359 100644 --- a/include/libcamera/ipa/ipa_interface.h +++ b/include/libcamera/ipa/ipa_interface.h @@ -4,8 +4,8 @@ * * ipa_interface.h - Image Processing Algorithm interface */ -#ifndef __LIBCAMERA_IPA_INTERFACE_H__ -#define __LIBCAMERA_IPA_INTERFACE_H__ + +#pragma once #include #include @@ -37,5 +37,3 @@ public: extern "C" { libcamera::IPAInterface *ipaCreate(); } - -#endif /* __LIBCAMERA_IPA_INTERFACE_H__ */ diff --git a/include/libcamera/ipa/ipa_module_info.h b/include/libcamera/ipa/ipa_module_info.h index 3b1c37d2a7f1..b19b00f71a9b 100644 --- a/include/libcamera/ipa/ipa_module_info.h +++ b/include/libcamera/ipa/ipa_module_info.h @@ -4,8 +4,8 @@ * * ipa_module_info.h - Image Processing Algorithm module information */ -#ifndef __LIBCAMERA_IPA_MODULE_INFO_H__ -#define __LIBCAMERA_IPA_MODULE_INFO_H__ + +#pragma once #include @@ -25,5 +25,3 @@ extern const struct IPAModuleInfo ipaModuleInfo; } } /* namespace libcamera */ - -#endif /* __LIBCAMERA_IPA_MODULE_INFO_H__ */ diff --git a/include/libcamera/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h index 521eaecd19b2..7f705e49411d 100644 --- a/include/libcamera/ipa/raspberrypi.h +++ b/include/libcamera/ipa/raspberrypi.h @@ -4,8 +4,8 @@ * * raspberrypi.h - Image Processing Algorithm interface for Raspberry Pi */ -#ifndef __LIBCAMERA_IPA_INTERFACE_RASPBERRYPI_H__ -#define __LIBCAMERA_IPA_INTERFACE_RASPBERRYPI_H__ + +#pragma once #include @@ -53,5 +53,3 @@ static const ControlInfoMap Controls({ } /* namespace libcamera */ #endif /* __DOXYGEN__ */ - -#endif /* __LIBCAMERA_IPA_INTERFACE_RASPBERRYPI_H__ */