From 2fa4ba01ffa2984e85ca77fce1430b6ae86ae84f Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sun, 23 Aug 2020 21:50:04 +0300
Subject: libcamera: Don't unnecessarily include event_notifier.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The ipc_unixsocket.h and process.h internal headers don't need to
include event_notifier.h, the former because a forward declaration
suffices, and the latter because it doesn't use event notifiers. Remove
the unnecessary include, and include signal.h instead which is required
and was included indirectly through event_notifier.h.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
include/libcamera/internal/ipc_unixsocket.h | 4 +++-
include/libcamera/internal/process.h | 2 +-
src/libcamera/ipc_unixsocket.cpp | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/libcamera/internal/ipc_unixsocket.h b/include/libcamera/internal/ipc_unixsocket.h
index 9dcaaa26..e871b650 100644
--- a/include/libcamera/internal/ipc_unixsocket.h
+++ b/include/libcamera/internal/ipc_unixsocket.h
@@ -12,10 +12,12 @@
#include <sys/types.h>
#include <vector>
-#include <libcamera/event_notifier.h>
+#include <libcamera/signal.h>
namespace libcamera {
+class EventNotifier;
+
class IPCUnixSocket
{
public:
diff --git a/include/libcamera/internal/process.h b/include/libcamera/internal/process.h
index 36595106..2688557c 100644
--- a/include/libcamera/internal/process.h
+++ b/include/libcamera/internal/process.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include <libcamera/event_notifier.h>
+#include <libcamera/signal.h>
namespace libcamera {
diff --git a/src/libcamera/ipc_unixsocket.cpp b/src/libcamera/ipc_unixsocket.cpp
index 701b2c51..5c8cce16 100644
--- a/src/libcamera/ipc_unixsocket.cpp
+++ b/src/libcamera/ipc_unixsocket.cpp
@@ -12,6 +12,8 @@
#include <sys/socket.h>
#include <unistd.h>
+#include <libcamera/event_notifier.h>
+
#include "libcamera/internal/log.h"
/**
--
cgit v1.2.1