[libcamera-devel] libcamera: Rename wrong header guards for internal includes
diff mbox series

Message ID 20210122145852.5568-1-laurent.pinchart@ideasonboard.com
State Accepted
Commit 992442df9a747ef72871e7a66453b67bb0e305ed
Headers show
Series
  • [libcamera-devel] libcamera: Rename wrong header guards for internal includes
Related show

Commit Message

Laurent Pinchart Jan. 22, 2021, 2:58 p.m. UTC 
Some internals includes that used to be public still have the public
header guard. Rename it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@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(-)

Comments

Kieran Bingham Jan. 22, 2021, 3:07 p.m. UTC | #1 
Hi Laurent,

On 22/01/2021 14:58, Laurent Pinchart wrote:
> Some internals includes that used to be public still have the public
> header guard. Rename it.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Simple enough.

Reviewed-by: Kieran Bingham <kieran.bingham@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__ */
>
Niklas Söderlund Jan. 22, 2021, 9:58 p.m. UTC | #2 
Hi Laurent,

Thanks for your work.

On 2021-01-22 16:58:52 +0200, Laurent Pinchart wrote:
> Some internals includes that used to be public still have the public
> header guard. Rename it.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  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
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
Paul Elder Jan. 23, 2021, 3:12 a.m. UTC | #3 
Hi Laurent,

On Fri, Jan 22, 2021 at 04:58:52PM +0200, Laurent Pinchart wrote:
> Some internals includes that used to be public still have the public
> header guard. Rename it.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Paul Elder <paul.elder@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
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch
diff mbox series 

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__ */