From patchwork Mon May 18 10:51:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3804 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F3CD3603DB for ; Mon, 18 May 2020 12:51:41 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="EiV0kQpW"; dkim-atps=neutral Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B15B9258 for ; Mon, 18 May 2020 12:51:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1589799100; bh=X39WWD6tSoCd480iuPT20Lpqfc6CMONSFJXSetE5AQQ=; h=From:To:Subject:Date:From; b=EiV0kQpWeCU6c0dUqnICxJz9v/E3gGH8Ww5UnbXyw5RUetfOeEj1mVUguYoKN94gG Y1VeYHvS+6hiJ0GQNO3boQ3+llGqyb8uGOBzgm8weAucxQhwv+oEentavPEzJuEfxV +wMaBg9NEDv2HyKBXgsVtNtYs1NB8S8vNbBfX/44= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Mon, 18 May 2020 13:51:29 +0300 Message-Id: <20200518105129.9867-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2] (q)cam: Fix header guards X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 May 2020 10:51:42 -0000 Several headers part of cam and qcam use __LIBCAMERA_*_H__ as a header 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. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- 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 #include @@ -28,4 +28,4 @@ private: std::map> 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__ */