From cc0b245096da68253dda94b3542a9387d73fda62 Mon Sep 17 00:00:00 2001
From: Kieran Bingham <kieran.bingham@ideasonboard.com>
Date: Tue, 23 Nov 2021 17:23:07 +0000
Subject: libcamera: ipa: Convert to pragma once

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 <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
---
 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(-)

(limited to 'include')

diff --git a/include/libcamera/ipa/ipa_controls.h b/include/libcamera/ipa/ipa_controls.h
index eec34d92..da1a7596 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 <stdint.h>
 
@@ -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 1590584c..50ca0e7b 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 <stddef.h>
 #include <stdint.h>
@@ -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 3b1c37d2..b19b00f7 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 <stdint.h>
 
@@ -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 521eaecd..7f705e49 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 <stdint.h>
 
@@ -53,5 +53,3 @@ static const ControlInfoMap Controls({
 } /* namespace libcamera */
 
 #endif /* __DOXYGEN__ */
-
-#endif /* __LIBCAMERA_IPA_INTERFACE_RASPBERRYPI_H__ */
-- 
cgit v1.2.1