[libcamera-devel] [PATCH v2] (q)cam: Fix header guards

[Kieran Bingham]

Hi Laurent,

On 18/05/2020 11:51, Laurent Pinchart wrote:
> Several headers part of cam and qcam use __LIBCAMERA_*_H__ as a header

s/headers part/headers form part/ ?

> guard. They're not part of the libcamera core, use __CAM_*_H__ and
> __QCAM_*_H__ instead, similarly to all other headers of cam and qcam.
> 

With this commit message fixed up a little:

Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>


> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
>  src/cam/buffer_writer.h | 6 +++---
>  src/qcam/dng_writer.h   | 6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/src/cam/buffer_writer.h b/src/cam/buffer_writer.h
> index 8c9b2436fdae..47e26103e13e 100644
> --- a/src/cam/buffer_writer.h
> +++ b/src/cam/buffer_writer.h
> @@ -4,8 +4,8 @@
>   *
>   * buffer_writer.h - Buffer writer
>   */
> -#ifndef __LIBCAMERA_BUFFER_WRITER_H__
> -#define __LIBCAMERA_BUFFER_WRITER_H__
> +#ifndef __CAM_BUFFER_WRITER_H__
> +#define __CAM_BUFFER_WRITER_H__
>  
>  #include <map>
>  #include <string>
> @@ -28,4 +28,4 @@ private:
>  	std::map<int, std::pair<void *, unsigned int>> mappedBuffers_;
>  };
>  
> -#endif /* __LIBCAMERA_BUFFER_WRITER_H__ */
> +#endif /* __CAM_BUFFER_WRITER_H__ */
> diff --git a/src/qcam/dng_writer.h b/src/qcam/dng_writer.h
> index d74d73d06a14..bf44c879aff7 100644
> --- a/src/qcam/dng_writer.h
> +++ b/src/qcam/dng_writer.h
> @@ -4,8 +4,8 @@
>   *
>   * dng_writer.h - DNG writer
>   */
> -#ifndef __LIBCAMERA_DNG_WRITER_H__
> -#define __LIBCAMERA_DNG_WRITER_H__
> +#ifndef __QCAM_DNG_WRITER_H__
> +#define __QCAM_DNG_WRITER_H__
>  
>  #ifdef HAVE_TIFF
>  #define HAVE_DNG
> @@ -28,4 +28,4 @@ public:
>  
>  #endif /* HAVE_TIFF */
>  
> -#endif /* __LIBCAMERA_DNG_WRITER_H__ */
> +#endif /* __QCAM_DNG_WRITER_H__ */
> 

-- 
Regards
--
Kieran