summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/libcamera/base/file_descriptor.h (renamed from include/libcamera/file_descriptor.h)0
-rw-r--r--include/libcamera/base/meson.build1
-rw-r--r--include/libcamera/framebuffer.h3
-rw-r--r--include/libcamera/internal/ipc_pipe.h3
-rw-r--r--include/libcamera/meson.build1
5 files changed, 3 insertions, 5 deletions
diff --git a/include/libcamera/file_descriptor.h b/include/libcamera/base/file_descriptor.h
index 8d764f8b..8d764f8b 100644
--- a/include/libcamera/file_descriptor.h
+++ b/include/libcamera/base/file_descriptor.h
diff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build
index 210a54f8..abd4cfc7 100644
--- a/include/libcamera/base/meson.build
+++ b/include/libcamera/base/meson.build
@@ -11,6 +11,7 @@ libcamera_base_headers = files([
'event_dispatcher_poll.h',
'event_notifier.h',
'file.h',
+ 'file_descriptor.h',
'flags.h',
'log.h',
'message.h',
diff --git a/include/libcamera/framebuffer.h b/include/libcamera/framebuffer.h
index 4e710e33..2fbea9c5 100644
--- a/include/libcamera/framebuffer.h
+++ b/include/libcamera/framebuffer.h
@@ -13,10 +13,9 @@
#include <vector>
#include <libcamera/base/class.h>
+#include <libcamera/base/file_descriptor.h>
#include <libcamera/base/span.h>
-#include <libcamera/file_descriptor.h>
-
namespace libcamera {
class Request;
diff --git a/include/libcamera/internal/ipc_pipe.h b/include/libcamera/internal/ipc_pipe.h
index bd8824f2..986f8d88 100644
--- a/include/libcamera/internal/ipc_pipe.h
+++ b/include/libcamera/internal/ipc_pipe.h
@@ -9,10 +9,9 @@
#include <vector>
+#include <libcamera/base/file_descriptor.h>
#include <libcamera/base/signal.h>
-#include <libcamera/file_descriptor.h>
-
#include "libcamera/internal/ipc_unixsocket.h"
namespace libcamera {
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index a8cca2a8..5f42977c 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -6,7 +6,6 @@ libcamera_public_headers = files([
'camera.h',
'camera_manager.h',
'controls.h',
- 'file_descriptor.h',
'framebuffer.h',
'framebuffer_allocator.h',
'geometry.h',