diff options
| author | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-11-23 17:23:07 +0000 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-11-24 12:19:06 +0000 |
| commit | 796210ecea8270cd870b0ef11833a26bfcf766cd (patch) | |
| tree | 868e2b787d53c66f6eaaf67116ed191fe02bb8cf | |
| parent | 7e125787add066625bb2a3f8eed8234bc4f8cc11 (diff) | |
v4l2: 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>
| -rw-r--r-- | src/v4l2/v4l2_camera.h | 5 | ||||
| -rw-r--r-- | src/v4l2/v4l2_camera_file.h | 5 | ||||
| -rw-r--r-- | src/v4l2/v4l2_camera_proxy.h | 5 | ||||
| -rw-r--r-- | src/v4l2/v4l2_compat_manager.h | 5 |
4 files changed, 4 insertions, 16 deletions
diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index e81996f2..94263b2f 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -5,8 +5,7 @@ * v4l2_camera.h - V4L2 compatibility camera */ -#ifndef __V4L2_CAMERA_H__ -#define __V4L2_CAMERA_H__ +#pragma once #include <deque> #include <mutex> @@ -86,5 +85,3 @@ private: std::condition_variable bufferCV_; unsigned int bufferAvailableCount_; }; - -#endif /* __V4L2_CAMERA_H__ */ diff --git a/src/v4l2/v4l2_camera_file.h b/src/v4l2/v4l2_camera_file.h index 8f4670a0..6c4cb5d8 100644 --- a/src/v4l2/v4l2_camera_file.h +++ b/src/v4l2/v4l2_camera_file.h @@ -5,8 +5,7 @@ * v4l2_camera_file.h - V4L2 compatibility camera file information */ -#ifndef __V4L2_CAMERA_FILE_H__ -#define __V4L2_CAMERA_FILE_H__ +#pragma once #include <linux/videodev2.h> @@ -33,5 +32,3 @@ private: int efd_; enum v4l2_priority priority_; }; - -#endif /* __V4L2_CAMERA_FILE_H__ */ diff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h index 56a45bb7..fccec241 100644 --- a/src/v4l2/v4l2_camera_proxy.h +++ b/src/v4l2/v4l2_camera_proxy.h @@ -5,8 +5,7 @@ * v4l2_camera_proxy.h - Proxy to V4L2 compatibility camera */ -#ifndef __V4L2_CAMERA_PROXY_H__ -#define __V4L2_CAMERA_PROXY_H__ +#pragma once #include <linux/videodev2.h> #include <map> @@ -100,5 +99,3 @@ private: /* This mutex is to serialize access to the proxy. */ libcamera::Mutex proxyMutex_; }; - -#endif /* __V4L2_CAMERA_PROXY_H__ */ diff --git a/src/v4l2/v4l2_compat_manager.h b/src/v4l2/v4l2_compat_manager.h index b11698cc..f52069f7 100644 --- a/src/v4l2/v4l2_compat_manager.h +++ b/src/v4l2/v4l2_compat_manager.h @@ -5,8 +5,7 @@ * v4l2_compat_manager.h - V4L2 compatibility manager */ -#ifndef __V4L2_COMPAT_MANAGER_H__ -#define __V4L2_COMPAT_MANAGER_H__ +#pragma once #include <fcntl.h> #include <map> @@ -68,5 +67,3 @@ private: std::map<int, std::shared_ptr<V4L2CameraFile>> files_; std::map<void *, V4L2CameraProxy *> mmaps_; }; - -#endif /* __V4L2_COMPAT_MANAGER_H__ */ |