From patchwork Tue Nov 23 22:40:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 14746 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id D8AFDC3250 for ; Tue, 23 Nov 2021 22:40:41 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8EAE0603C2; Tue, 23 Nov 2021 23:40:41 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="hxe83UBz"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2CAB56039C for ; Tue, 23 Nov 2021 23:40:24 +0100 (CET) Received: from Monstersaurus.ksquared.org.uk.beta.tailscale.net (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id CE977A1B; Tue, 23 Nov 2021 23:40:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1637707223; bh=yYvUufQThQXROZnjJQKHggiNEQAwdpCWMiKXWcXqZAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hxe83UBzUS0O1vQV3CLWNWovPrYULxLd+cDt9bY0YBYyOnQXXXztQDCMeC3oEqIJ1 ur/verOhSoNrdfz7TKgoe3gm/qyx3HpkZWhJStP1fe4HeaqhBFilxP6g/Ee/UKNhCc q+lKrEkMTPey3eXiPaQ30GNkCojYUrMtYlJE+W/g= From: Kieran Bingham To: libcamera devel Date: Tue, 23 Nov 2021 22:40:15 +0000 Message-Id: <20211123224015.3619282-16-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211123224015.3619282-1-kieran.bingham@ideasonboard.com> References: <20211123224015.3619282-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 15/15] v4l2: Convert to pragma once 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Remove the verbose #ifndef/#define/#endif pattern for maintaining header idempotency, and replace it with a simple #pragma once. This simplifies the headers, and prevents redundant changes when header files get moved. Signed-off-by: Kieran Bingham --- src/v4l2/v4l2_camera.h | 5 +---- src/v4l2/v4l2_camera_file.h | 5 +---- src/v4l2/v4l2_camera_proxy.h | 5 +---- src/v4l2/v4l2_compat_manager.h | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index e81996f21168..94263b2f5db6 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -5,8 +5,7 @@ * v4l2_camera.h - V4L2 compatibility camera */ -#ifndef __V4L2_CAMERA_H__ -#define __V4L2_CAMERA_H__ +#pragma once #include #include @@ -86,5 +85,3 @@ private: std::condition_variable bufferCV_; unsigned int bufferAvailableCount_; }; - -#endif /* __V4L2_CAMERA_H__ */ diff --git a/src/v4l2/v4l2_camera_file.h b/src/v4l2/v4l2_camera_file.h index 8f4670a0fa49..6c4cb5d89dbf 100644 --- a/src/v4l2/v4l2_camera_file.h +++ b/src/v4l2/v4l2_camera_file.h @@ -5,8 +5,7 @@ * v4l2_camera_file.h - V4L2 compatibility camera file information */ -#ifndef __V4L2_CAMERA_FILE_H__ -#define __V4L2_CAMERA_FILE_H__ +#pragma once #include @@ -33,5 +32,3 @@ private: int efd_; enum v4l2_priority priority_; }; - -#endif /* __V4L2_CAMERA_FILE_H__ */ diff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h index 56a45bb76650..fccec241879d 100644 --- a/src/v4l2/v4l2_camera_proxy.h +++ b/src/v4l2/v4l2_camera_proxy.h @@ -5,8 +5,7 @@ * v4l2_camera_proxy.h - Proxy to V4L2 compatibility camera */ -#ifndef __V4L2_CAMERA_PROXY_H__ -#define __V4L2_CAMERA_PROXY_H__ +#pragma once #include #include @@ -100,5 +99,3 @@ private: /* This mutex is to serialize access to the proxy. */ libcamera::Mutex proxyMutex_; }; - -#endif /* __V4L2_CAMERA_PROXY_H__ */ diff --git a/src/v4l2/v4l2_compat_manager.h b/src/v4l2/v4l2_compat_manager.h index b11698cc165f..f52069f7b62d 100644 --- a/src/v4l2/v4l2_compat_manager.h +++ b/src/v4l2/v4l2_compat_manager.h @@ -5,8 +5,7 @@ * v4l2_compat_manager.h - V4L2 compatibility manager */ -#ifndef __V4L2_COMPAT_MANAGER_H__ -#define __V4L2_COMPAT_MANAGER_H__ +#pragma once #include #include @@ -68,5 +67,3 @@ private: std::map> files_; std::map mmaps_; }; - -#endif /* __V4L2_COMPAT_MANAGER_H__ */