[libcamera-devel] [PATCH/RFC 03/11] libcamera: Rename header guards for internal headers
Niklas Söderlund
niklas.soderlund at ragnatech.se
Fri Jun 5 22:00:56 CEST 2020
Hi Laurent,
Thanks for your work.
On 2020-05-22 17:54:51 +0300, Laurent Pinchart wrote:
> With the internal headers now in include/libcamera/internal/, we may
> have identically named headers in include/libcamera/. Their header
> guards would clash. Rename the header guards of internal headers to
> prevent any issue.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
I have not verified every addition of 'INTERNAL_' but I agree with the
pattern and trust you repeated it correctly for all files :-)
Reviewed-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
> ---
> include/libcamera/internal/byte_stream_buffer.h | 6 +++---
> include/libcamera/internal/camera_controls.h | 6 +++---
> include/libcamera/internal/camera_sensor.h | 6 +++---
> include/libcamera/internal/control_serializer.h | 6 +++---
> include/libcamera/internal/control_validator.h | 6 +++---
> include/libcamera/internal/device_enumerator.h | 6 +++---
> include/libcamera/internal/device_enumerator_sysfs.h | 6 +++---
> include/libcamera/internal/device_enumerator_udev.h | 6 +++---
> include/libcamera/internal/event_dispatcher_poll.h | 6 +++---
> include/libcamera/internal/file.h | 6 +++---
> include/libcamera/internal/formats.h | 6 +++---
> include/libcamera/internal/ipa_context_wrapper.h | 6 +++---
> include/libcamera/internal/ipa_manager.h | 6 +++---
> include/libcamera/internal/ipa_module.h | 6 +++---
> include/libcamera/internal/ipa_proxy.h | 6 +++---
> include/libcamera/internal/ipc_unixsocket.h | 6 +++---
> include/libcamera/internal/log.h | 6 +++---
> include/libcamera/internal/media_device.h | 6 +++---
> include/libcamera/internal/media_object.h | 6 +++---
> include/libcamera/internal/message.h | 6 +++---
> include/libcamera/internal/pipeline_handler.h | 6 +++---
> include/libcamera/internal/process.h | 6 +++---
> include/libcamera/internal/pub_key.h | 6 +++---
> include/libcamera/internal/semaphore.h | 6 +++---
> include/libcamera/internal/thread.h | 6 +++---
> include/libcamera/internal/utils.h | 6 +++---
> include/libcamera/internal/v4l2_controls.h | 6 +++---
> include/libcamera/internal/v4l2_device.h | 6 +++---
> include/libcamera/internal/v4l2_pixelformat.h | 6 +++---
> include/libcamera/internal/v4l2_subdevice.h | 6 +++---
> include/libcamera/internal/v4l2_videodevice.h | 6 +++---
> 31 files changed, 93 insertions(+), 93 deletions(-)
>
> diff --git a/include/libcamera/internal/byte_stream_buffer.h b/include/libcamera/internal/byte_stream_buffer.h
> index b3aaa8b9fb28..db59577dc332 100644
> --- a/include/libcamera/internal/byte_stream_buffer.h
> +++ b/include/libcamera/internal/byte_stream_buffer.h
> @@ -4,8 +4,8 @@
> *
> * byte_stream_buffer.h - Byte stream buffer
> */
> -#ifndef __LIBCAMERA_BYTE_STREAM_BUFFER_H__
> -#define __LIBCAMERA_BYTE_STREAM_BUFFER_H__
> +#ifndef __LIBCAMERA_INTERNAL_BYTE_STREAM_BUFFER_H__
> +#define __LIBCAMERA_INTERNAL_BYTE_STREAM_BUFFER_H__
>
> #include <stddef.h>
> #include <stdint.h>
> @@ -86,4 +86,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_BYTE_STREAM_BUFFER_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_BYTE_STREAM_BUFFER_H__ */
> diff --git a/include/libcamera/internal/camera_controls.h b/include/libcamera/internal/camera_controls.h
> index dc8b3ba84bc4..6e40f4436cad 100644
> --- a/include/libcamera/internal/camera_controls.h
> +++ b/include/libcamera/internal/camera_controls.h
> @@ -4,8 +4,8 @@
> *
> * camera_controls.h - Camera controls
> */
> -#ifndef __LIBCAMERA_CAMERA_CONTROLS_H__
> -#define __LIBCAMERA_CAMERA_CONTROLS_H__
> +#ifndef __LIBCAMERA_INTERNAL_CAMERA_CONTROLS_H__
> +#define __LIBCAMERA_INTERNAL_CAMERA_CONTROLS_H__
>
> #include "libcamera/internal/control_validator.h"
>
> @@ -27,4 +27,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_CAMERA_CONTROLS_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_CAMERA_CONTROLS_H__ */
> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h
> index d79bd9ce9d58..1f9de03c7563 100644
> --- a/include/libcamera/internal/camera_sensor.h
> +++ b/include/libcamera/internal/camera_sensor.h
> @@ -4,8 +4,8 @@
> *
> * camera_sensor.h - A camera sensor
> */
> -#ifndef __LIBCAMERA_CAMERA_SENSOR_H__
> -#define __LIBCAMERA_CAMERA_SENSOR_H__
> +#ifndef __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__
> +#define __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__
>
> #include <memory>
> #include <string>
> @@ -85,4 +85,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_CAMERA_SENSOR_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__ */
> diff --git a/include/libcamera/internal/control_serializer.h b/include/libcamera/internal/control_serializer.h
> index 99bacd920fce..0ab29d9ad8bc 100644
> --- a/include/libcamera/internal/control_serializer.h
> +++ b/include/libcamera/internal/control_serializer.h
> @@ -4,8 +4,8 @@
> *
> * control_serializer.h - Control (de)serializer
> */
> -#ifndef __LIBCAMERA_CONTROL_SERIALIZER_H__
> -#define __LIBCAMERA_CONTROL_SERIALIZER_H__
> +#ifndef __LIBCAMERA_INTERNAL_CONTROL_SERIALIZER_H__
> +#define __LIBCAMERA_INTERNAL_CONTROL_SERIALIZER_H__
>
> #include <map>
> #include <memory>
> @@ -52,4 +52,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_CONTROL_SERIALIZER_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_CONTROL_SERIALIZER_H__ */
> diff --git a/include/libcamera/internal/control_validator.h b/include/libcamera/internal/control_validator.h
> index f1c9110b158f..4a00b9b7f686 100644
> --- a/include/libcamera/internal/control_validator.h
> +++ b/include/libcamera/internal/control_validator.h
> @@ -4,8 +4,8 @@
> *
> * control_validator.h - Control validator
> */
> -#ifndef __LIBCAMERA_CONTROL_VALIDATOR_H__
> -#define __LIBCAMERA_CONTROL_VALIDATOR_H__
> +#ifndef __LIBCAMERA_INTERNAL_CONTROL_VALIDATOR_H__
> +#define __LIBCAMERA_INTERNAL_CONTROL_VALIDATOR_H__
>
> #include <string>
>
> @@ -24,4 +24,4 @@ public:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_CONTROL_VALIDATOR_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_CONTROL_VALIDATOR_H__ */
> diff --git a/include/libcamera/internal/device_enumerator.h b/include/libcamera/internal/device_enumerator.h
> index 433e357aebae..25a363086e49 100644
> --- a/include/libcamera/internal/device_enumerator.h
> +++ b/include/libcamera/internal/device_enumerator.h
> @@ -4,8 +4,8 @@
> *
> * device_enumerator.h - API to enumerate and find media devices
> */
> -#ifndef __LIBCAMERA_DEVICE_ENUMERATOR_H__
> -#define __LIBCAMERA_DEVICE_ENUMERATOR_H__
> +#ifndef __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_H__
> +#define __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_H__
>
> #include <memory>
> #include <string>
> @@ -54,4 +54,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_DEVICE_ENUMERATOR_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_H__ */
> diff --git a/include/libcamera/internal/device_enumerator_sysfs.h b/include/libcamera/internal/device_enumerator_sysfs.h
> index a63e737a78d5..2112bc543054 100644
> --- a/include/libcamera/internal/device_enumerator_sysfs.h
> +++ b/include/libcamera/internal/device_enumerator_sysfs.h
> @@ -4,8 +4,8 @@
> *
> * device_enumerator_sysfs.h - sysfs-based device enumerator
> */
> -#ifndef __LIBCAMERA_DEVICE_ENUMERATOR_SYSFS_H__
> -#define __LIBCAMERA_DEVICE_ENUMERATOR_SYSFS_H__
> +#ifndef __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_SYSFS_H__
> +#define __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_SYSFS_H__
>
> #include <memory>
> #include <string>
> @@ -29,4 +29,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_DEVICE_ENUMERATOR_SYSFS_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_SYSFS_H__ */
> diff --git a/include/libcamera/internal/device_enumerator_udev.h b/include/libcamera/internal/device_enumerator_udev.h
> index fdaa20968ef0..818d8bc71d67 100644
> --- a/include/libcamera/internal/device_enumerator_udev.h
> +++ b/include/libcamera/internal/device_enumerator_udev.h
> @@ -4,8 +4,8 @@
> *
> * device_enumerator_udev.h - udev-based device enumerator
> */
> -#ifndef __LIBCAMERA_DEVICE_ENUMERATOR_UDEV_H__
> -#define __LIBCAMERA_DEVICE_ENUMERATOR_UDEV_H__
> +#ifndef __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_UDEV_H__
> +#define __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_UDEV_H__
>
> #include <list>
> #include <map>
> @@ -72,4 +72,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_DEVICE_ENUMERATOR_UDEV_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_UDEV_H__ */
> diff --git a/include/libcamera/internal/event_dispatcher_poll.h b/include/libcamera/internal/event_dispatcher_poll.h
> index 1f0738617425..fb774efd3d97 100644
> --- a/include/libcamera/internal/event_dispatcher_poll.h
> +++ b/include/libcamera/internal/event_dispatcher_poll.h
> @@ -4,8 +4,8 @@
> *
> * event_dispatcher_poll.h - Poll-based event dispatcher
> */
> -#ifndef __LIBCAMERA_EVENT_DISPATCHER_POLL_H__
> -#define __LIBCAMERA_EVENT_DISPATCHER_POLL_H__
> +#ifndef __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__
> +#define __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__
>
> #include <list>
> #include <map>
> @@ -55,4 +55,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_EVENT_DISPATCHER_POLL_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__ */
> diff --git a/include/libcamera/internal/file.h b/include/libcamera/internal/file.h
> index f020f2ccba1d..e3e72132e336 100644
> --- a/include/libcamera/internal/file.h
> +++ b/include/libcamera/internal/file.h
> @@ -4,8 +4,8 @@
> *
> * file.h - File I/O operations
> */
> -#ifndef __LIBCAMERA_FILE_H__
> -#define __LIBCAMERA_FILE_H__
> +#ifndef __LIBCAMERA_INTERNAL_FILE_H__
> +#define __LIBCAMERA_INTERNAL_FILE_H__
>
> #include <map>
> #include <string>
> @@ -68,4 +68,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_FILE_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_FILE_H__ */
> diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h
> index 4455b0f9b050..4b172efc6588 100644
> --- a/include/libcamera/internal/formats.h
> +++ b/include/libcamera/internal/formats.h
> @@ -5,8 +5,8 @@
> * formats.h - libcamera image formats
> */
>
> -#ifndef __LIBCAMERA_FORMATS_H__
> -#define __LIBCAMERA_FORMATS_H__
> +#ifndef __LIBCAMERA_INTERNAL_FORMATS_H__
> +#define __LIBCAMERA_INTERNAL_FORMATS_H__
>
> #include <map>
> #include <vector>
> @@ -55,4 +55,4 @@ public:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_FORMATS_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_FORMATS_H__ */
> diff --git a/include/libcamera/internal/ipa_context_wrapper.h b/include/libcamera/internal/ipa_context_wrapper.h
> index bd770e132c0c..4e6f791d18e6 100644
> --- a/include/libcamera/internal/ipa_context_wrapper.h
> +++ b/include/libcamera/internal/ipa_context_wrapper.h
> @@ -4,8 +4,8 @@
> *
> * ipa_context_wrapper.h - Image Processing Algorithm context wrapper
> */
> -#ifndef __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__
> -#define __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__
> +#ifndef __LIBCAMERA_INTERNAL_IPA_CONTEXT_WRAPPER_H__
> +#define __LIBCAMERA_INTERNAL_IPA_CONTEXT_WRAPPER_H__
>
> #include <libcamera/ipa/ipa_interface.h>
>
> @@ -47,4 +47,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_IPA_CONTEXT_WRAPPER_H__ */
> diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h
> index 2412d75746ac..63430ade8a7a 100644
> --- a/include/libcamera/internal/ipa_manager.h
> +++ b/include/libcamera/internal/ipa_manager.h
> @@ -4,8 +4,8 @@
> *
> * ipa_manager.h - Image Processing Algorithm module manager
> */
> -#ifndef __LIBCAMERA_IPA_MANAGER_H__
> -#define __LIBCAMERA_IPA_MANAGER_H__
> +#ifndef __LIBCAMERA_INTERNAL_IPA_MANAGER_H__
> +#define __LIBCAMERA_INTERNAL_IPA_MANAGER_H__
>
> #include <stdint.h>
> #include <vector>
> @@ -48,4 +48,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_IPA_MANAGER_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_IPA_MANAGER_H__ */
> diff --git a/include/libcamera/internal/ipa_module.h b/include/libcamera/internal/ipa_module.h
> index 5b54cb31a48a..c80aaf46f81b 100644
> --- a/include/libcamera/internal/ipa_module.h
> +++ b/include/libcamera/internal/ipa_module.h
> @@ -4,8 +4,8 @@
> *
> * ipa_module.h - Image Processing Algorithm module
> */
> -#ifndef __LIBCAMERA_IPA_MODULE_H__
> -#define __LIBCAMERA_IPA_MODULE_H__
> +#ifndef __LIBCAMERA_INTERNAL_IPA_MODULE_H__
> +#define __LIBCAMERA_INTERNAL_IPA_MODULE_H__
>
> #include <stdint.h>
> #include <string>
> @@ -58,4 +58,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_IPA_MODULE_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_IPA_MODULE_H__ */
> diff --git a/include/libcamera/internal/ipa_proxy.h b/include/libcamera/internal/ipa_proxy.h
> index e9a36608bd31..aec8f04ffc15 100644
> --- a/include/libcamera/internal/ipa_proxy.h
> +++ b/include/libcamera/internal/ipa_proxy.h
> @@ -4,8 +4,8 @@
> *
> * ipa_proxy.h - Image Processing Algorithm proxy
> */
> -#ifndef __LIBCAMERA_IPA_PROXY_H__
> -#define __LIBCAMERA_IPA_PROXY_H__
> +#ifndef __LIBCAMERA_INTERNAL_IPA_PROXY_H__
> +#define __LIBCAMERA_INTERNAL_IPA_PROXY_H__
>
> #include <memory>
> #include <string>
> @@ -67,4 +67,4 @@ static proxy##Factory global_##proxy##Factory;
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_IPA_PROXY_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_IPA_PROXY_H__ */
> diff --git a/include/libcamera/internal/ipc_unixsocket.h b/include/libcamera/internal/ipc_unixsocket.h
> index 820d05611049..9dcaaa26956d 100644
> --- a/include/libcamera/internal/ipc_unixsocket.h
> +++ b/include/libcamera/internal/ipc_unixsocket.h
> @@ -5,8 +5,8 @@
> * ipc_unixsocket.h - IPC mechanism based on Unix sockets
> */
>
> -#ifndef __LIBCAMERA_IPC_UNIXSOCKET_H__
> -#define __LIBCAMERA_IPC_UNIXSOCKET_H__
> +#ifndef __LIBCAMERA_INTERNAL_IPC_UNIXSOCKET_H__
> +#define __LIBCAMERA_INTERNAL_IPC_UNIXSOCKET_H__
>
> #include <stdint.h>
> #include <sys/types.h>
> @@ -56,4 +56,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_IPC_UNIXSOCKET_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_IPC_UNIXSOCKET_H__ */
> diff --git a/include/libcamera/internal/log.h b/include/libcamera/internal/log.h
> index cab2034aae6b..4b10087a4718 100644
> --- a/include/libcamera/internal/log.h
> +++ b/include/libcamera/internal/log.h
> @@ -4,8 +4,8 @@
> *
> * log.h - Logging infrastructure
> */
> -#ifndef __LIBCAMERA_LOG_H__
> -#define __LIBCAMERA_LOG_H__
> +#ifndef __LIBCAMERA_INTERNAL_LOG_H__
> +#define __LIBCAMERA_INTERNAL_LOG_H__
>
> #include <chrono>
> #include <sstream>
> @@ -127,4 +127,4 @@ LogMessage _log(const char *file, unsigned int line,
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_LOG_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_LOG_H__ */
> diff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h
> index 9fe76c514b17..24093674fe15 100644
> --- a/include/libcamera/internal/media_device.h
> +++ b/include/libcamera/internal/media_device.h
> @@ -4,8 +4,8 @@
> *
> * media_device.h - Media device handler
> */
> -#ifndef __LIBCAMERA_MEDIA_DEVICE_H__
> -#define __LIBCAMERA_MEDIA_DEVICE_H__
> +#ifndef __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__
> +#define __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__
>
> #include <map>
> #include <sstream>
> @@ -91,4 +91,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_MEDIA_DEVICE_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__ */
> diff --git a/include/libcamera/internal/media_object.h b/include/libcamera/internal/media_object.h
> index 748eafdc880b..d9b1c19bbf96 100644
> --- a/include/libcamera/internal/media_object.h
> +++ b/include/libcamera/internal/media_object.h
> @@ -4,8 +4,8 @@
> *
> * media_object.h - Media Device objects: entities, pads and links.
> */
> -#ifndef __LIBCAMERA_MEDIA_OBJECT_H__
> -#define __LIBCAMERA_MEDIA_OBJECT_H__
> +#ifndef __LIBCAMERA_INTERNAL_MEDIA_OBJECT_H__
> +#define __LIBCAMERA_INTERNAL_MEDIA_OBJECT_H__
>
> #include <string>
> #include <vector>
> @@ -121,4 +121,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_MEDIA_OBJECT_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_MEDIA_OBJECT_H__ */
> diff --git a/include/libcamera/internal/message.h b/include/libcamera/internal/message.h
> index 8e8b013dcd18..92ea64a5d714 100644
> --- a/include/libcamera/internal/message.h
> +++ b/include/libcamera/internal/message.h
> @@ -4,8 +4,8 @@
> *
> * message.h - Message queue support
> */
> -#ifndef __LIBCAMERA_MESSAGE_H__
> -#define __LIBCAMERA_MESSAGE_H__
> +#ifndef __LIBCAMERA_INTERNAL_MESSAGE_H__
> +#define __LIBCAMERA_INTERNAL_MESSAGE_H__
>
> #include <atomic>
>
> @@ -67,4 +67,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_MESSAGE_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_MESSAGE_H__ */
> diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h
> index 428f5887c76b..56968d14a6e8 100644
> --- a/include/libcamera/internal/pipeline_handler.h
> +++ b/include/libcamera/internal/pipeline_handler.h
> @@ -4,8 +4,8 @@
> *
> * pipeline_handler.h - Pipeline handler infrastructure
> */
> -#ifndef __LIBCAMERA_PIPELINE_HANDLER_H__
> -#define __LIBCAMERA_PIPELINE_HANDLER_H__
> +#ifndef __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__
> +#define __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__
>
> #include <list>
> #include <map>
> @@ -148,4 +148,4 @@ static handler##Factory global_##handler##Factory;
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_PIPELINE_HANDLER_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__ */
> diff --git a/include/libcamera/internal/process.h b/include/libcamera/internal/process.h
> index d322fce13ae4..36595106f3b9 100644
> --- a/include/libcamera/internal/process.h
> +++ b/include/libcamera/internal/process.h
> @@ -4,8 +4,8 @@
> *
> * process.h - Process object
> */
> -#ifndef __LIBCAMERA_PROCESS_H__
> -#define __LIBCAMERA_PROCESS_H__
> +#ifndef __LIBCAMERA_INTERNAL_PROCESS_H__
> +#define __LIBCAMERA_INTERNAL_PROCESS_H__
>
> #include <string>
> #include <vector>
> @@ -52,4 +52,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_PROCESS_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_PROCESS_H__ */
> diff --git a/include/libcamera/internal/pub_key.h b/include/libcamera/internal/pub_key.h
> index f35bf3738c6f..f5f988b58f74 100644
> --- a/include/libcamera/internal/pub_key.h
> +++ b/include/libcamera/internal/pub_key.h
> @@ -4,8 +4,8 @@
> *
> * pub_key.h - Public key signature verification
> */
> -#ifndef __LIBCAMERA_PUB_KEY_H__
> -#define __LIBCAMERA_PUB_KEY_H__
> +#ifndef __LIBCAMERA_INTERNAL_PUB_KEY_H__
> +#define __LIBCAMERA_INTERNAL_PUB_KEY_H__
>
> #include <stdint.h>
>
> @@ -35,4 +35,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_PUB_KEY_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_PUB_KEY_H__ */
> diff --git a/include/libcamera/internal/semaphore.h b/include/libcamera/internal/semaphore.h
> index 4d93077c776f..9dc65d299cfd 100644
> --- a/include/libcamera/internal/semaphore.h
> +++ b/include/libcamera/internal/semaphore.h
> @@ -4,8 +4,8 @@
> *
> * semaphore.h - General-purpose counting semaphore
> */
> -#ifndef __LIBCAMERA_SEMAPHORE_H__
> -#define __LIBCAMERA_SEMAPHORE_H__
> +#ifndef __LIBCAMERA_INTERNAL_SEMAPHORE_H__
> +#define __LIBCAMERA_INTERNAL_SEMAPHORE_H__
>
> #include <condition_variable>
>
> @@ -31,4 +31,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_SEMAPHORE_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_SEMAPHORE_H__ */
> diff --git a/include/libcamera/internal/thread.h b/include/libcamera/internal/thread.h
> index 6594c9b06b8d..7b59e583c19f 100644
> --- a/include/libcamera/internal/thread.h
> +++ b/include/libcamera/internal/thread.h
> @@ -4,8 +4,8 @@
> *
> * thread.h - Thread support
> */
> -#ifndef __LIBCAMERA_THREAD_H__
> -#define __LIBCAMERA_THREAD_H__
> +#ifndef __LIBCAMERA_INTERNAL_THREAD_H__
> +#define __LIBCAMERA_INTERNAL_THREAD_H__
>
> #include <memory>
> #include <mutex>
> @@ -74,4 +74,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_THREAD_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_THREAD_H__ */
> diff --git a/include/libcamera/internal/utils.h b/include/libcamera/internal/utils.h
> index 3334ff16613d..0953423ee8d0 100644
> --- a/include/libcamera/internal/utils.h
> +++ b/include/libcamera/internal/utils.h
> @@ -4,8 +4,8 @@
> *
> * utils.h - Miscellaneous utility functions
> */
> -#ifndef __LIBCAMERA_UTILS_H__
> -#define __LIBCAMERA_UTILS_H__
> +#ifndef __LIBCAMERA_INTERNAL_UTILS_H__
> +#define __LIBCAMERA_INTERNAL_UTILS_H__
>
> #include <algorithm>
> #include <chrono>
> @@ -194,4 +194,4 @@ std::string libcameraSourcePath();
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_UTILS_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_UTILS_H__ */
> diff --git a/include/libcamera/internal/v4l2_controls.h b/include/libcamera/internal/v4l2_controls.h
> index cffe9efd9919..0851b8ddb128 100644
> --- a/include/libcamera/internal/v4l2_controls.h
> +++ b/include/libcamera/internal/v4l2_controls.h
> @@ -5,8 +5,8 @@
> * v4l2_controls.h - V4L2 Controls Support
> */
>
> -#ifndef __LIBCAMERA_V4L2_CONTROLS_H__
> -#define __LIBCAMERA_V4L2_CONTROLS_H__
> +#ifndef __LIBCAMERA_INTERNAL_V4L2_CONTROLS_H__
> +#define __LIBCAMERA_INTERNAL_V4L2_CONTROLS_H__
>
> #include <linux/videodev2.h>
>
> @@ -28,4 +28,4 @@ public:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_V4L2_CONTROLS_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_V4L2_CONTROLS_H__ */
> diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h
> index d491eafd262e..bf643f2ec966 100644
> --- a/include/libcamera/internal/v4l2_device.h
> +++ b/include/libcamera/internal/v4l2_device.h
> @@ -4,8 +4,8 @@
> *
> * v4l2_device.h - Common base for V4L2 video devices and subdevices
> */
> -#ifndef __LIBCAMERA_V4L2_DEVICE_H__
> -#define __LIBCAMERA_V4L2_DEVICE_H__
> +#ifndef __LIBCAMERA_INTERNAL_V4L2_DEVICE_H__
> +#define __LIBCAMERA_INTERNAL_V4L2_DEVICE_H__
>
> #include <map>
> #include <memory>
> @@ -57,4 +57,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_V4L2_DEVICE_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_V4L2_DEVICE_H__ */
> diff --git a/include/libcamera/internal/v4l2_pixelformat.h b/include/libcamera/internal/v4l2_pixelformat.h
> index 4d0e034b8b51..9bfd81ad6651 100644
> --- a/include/libcamera/internal/v4l2_pixelformat.h
> +++ b/include/libcamera/internal/v4l2_pixelformat.h
> @@ -5,8 +5,8 @@
> *
> * v4l2_pixelformat.h - V4L2 Pixel Format
> */
> -#ifndef __LIBCAMERA_V4L2_PIXELFORMAT_H__
> -#define __LIBCAMERA_V4L2_PIXELFORMAT_H__
> +#ifndef __LIBCAMERA_INTERNAL_V4L2_PIXELFORMAT_H__
> +#define __LIBCAMERA_INTERNAL_V4L2_PIXELFORMAT_H__
>
> #include <stdint.h>
> #include <string>
> @@ -46,4 +46,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_V4L2_PIXELFORMAT_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_V4L2_PIXELFORMAT_H__ */
> diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h
> index 1be454f0ddda..8016fa5da68c 100644
> --- a/include/libcamera/internal/v4l2_subdevice.h
> +++ b/include/libcamera/internal/v4l2_subdevice.h
> @@ -4,8 +4,8 @@
> *
> * v4l2_subdevice.h - V4L2 Subdevice
> */
> -#ifndef __LIBCAMERA_V4L2_SUBDEVICE_H__
> -#define __LIBCAMERA_V4L2_SUBDEVICE_H__
> +#ifndef __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__
> +#define __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__
>
> #include <string>
> #include <vector>
> @@ -74,4 +74,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_V4L2_SUBDEVICE_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__ */
> diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h
> index c93cf816373b..29d819a8dacd 100644
> --- a/include/libcamera/internal/v4l2_videodevice.h
> +++ b/include/libcamera/internal/v4l2_videodevice.h
> @@ -4,8 +4,8 @@
> *
> * v4l2_videodevice.h - V4L2 Video Device
> */
> -#ifndef __LIBCAMERA_V4L2_VIDEODEVICE_H__
> -#define __LIBCAMERA_V4L2_VIDEODEVICE_H__
> +#ifndef __LIBCAMERA_INTERNAL_V4L2_VIDEODEVICE_H__
> +#define __LIBCAMERA_INTERNAL_V4L2_VIDEODEVICE_H__
>
> #include <atomic>
> #include <memory>
> @@ -274,4 +274,4 @@ private:
>
> } /* namespace libcamera */
>
> -#endif /* __LIBCAMERA_V4L2_VIDEODEVICE_H__ */
> +#endif /* __LIBCAMERA_INTERNAL_V4L2_VIDEODEVICE_H__ */
> --
> Regards,
>
> Laurent Pinchart
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel at lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
--
Regards,
Niklas Söderlund
More information about the libcamera-devel
mailing list