[libcamera-devel] [PATCH] libcamera: Rename wrong header guards for internal includes

Laurent Pinchart laurent.pinchart at ideasonboard.com
Fri Jan 22 15:58:52 CET 2021


Some internals includes that used to be public still have the public
header guard. Rename it.

Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
 include/libcamera/internal/event_dispatcher.h | 6 +++---
 include/libcamera/internal/event_notifier.h   | 6 +++---
 include/libcamera/internal/timer.h            | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/libcamera/internal/event_dispatcher.h b/include/libcamera/internal/event_dispatcher.h
index cb06bf208e12..e6a8ad65ce0a 100644
--- a/include/libcamera/internal/event_dispatcher.h
+++ b/include/libcamera/internal/event_dispatcher.h
@@ -4,8 +4,8 @@
  *
  * event_dispatcher.h - Event dispatcher
  */
-#ifndef __LIBCAMERA_EVENT_DISPATCHER_H__
-#define __LIBCAMERA_EVENT_DISPATCHER_H__
+#ifndef __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_H__
+#define __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_H__
 
 #include <vector>
 
@@ -32,4 +32,4 @@ public:
 
 } /* namespace libcamera */
 
-#endif /* __LIBCAMERA_EVENT_DISPATCHER_H__ */
+#endif /* __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_H__ */
diff --git a/include/libcamera/internal/event_notifier.h b/include/libcamera/internal/event_notifier.h
index a37b02eee4b7..cc3495c024f0 100644
--- a/include/libcamera/internal/event_notifier.h
+++ b/include/libcamera/internal/event_notifier.h
@@ -4,8 +4,8 @@
  *
  * event_notifier.h - File descriptor event notifier
  */
-#ifndef __LIBCAMERA_EVENT_NOTIFIER_H__
-#define __LIBCAMERA_EVENT_NOTIFIER_H__
+#ifndef __LIBCAMERA_INTERNAL_EVENT_NOTIFIER_H__
+#define __LIBCAMERA_INTERNAL_EVENT_NOTIFIER_H__
 
 #include <libcamera/object.h>
 #include <libcamera/signal.h>
@@ -45,4 +45,4 @@ private:
 
 } /* namespace libcamera */
 
-#endif /* __LIBCAMERA_EVENT_NOTIFIER_H__ */
+#endif /* __LIBCAMERA_INTERNAL_EVENT_NOTIFIER_H__ */
diff --git a/include/libcamera/internal/timer.h b/include/libcamera/internal/timer.h
index f55fe3c09660..013e93c0b4e6 100644
--- a/include/libcamera/internal/timer.h
+++ b/include/libcamera/internal/timer.h
@@ -4,8 +4,8 @@
  *
  * timer.h - Generic timer
  */
-#ifndef __LIBCAMERA_TIMER_H__
-#define __LIBCAMERA_TIMER_H__
+#ifndef __LIBCAMERA_INTERNAL_TIMER_H__
+#define __LIBCAMERA_INTERNAL_TIMER_H__
 
 #include <chrono>
 #include <stdint.h>
@@ -46,4 +46,4 @@ private:
 
 } /* namespace libcamera */
 
-#endif /* __LIBCAMERA_TIMER_H__ */
+#endif /* __LIBCAMERA_INTERNAL_TIMER_H__ */
-- 
Regards,

Laurent Pinchart



More information about the libcamera-devel mailing list