system/FileDescriptor: move to io/

2020-05-05 14:11:13 +02:00
parent 97f7270aa8
commit 9815d10137
24 changed files with 30 additions and 19 deletions
--- a/src/fs/FileSystem.hxx
+++ b/src/fs/FileSystem.hxx
@@ -21,7 +21,7 @@
 #define MPD_FS_FILESYSTEM_HXX

 #include "Path.hxx"
-#include "system/UniqueFileDescriptor.hxx"
+#include "io/UniqueFileDescriptor.hxx"

 #ifdef _WIN32
 #include <fileapi.h>
--- a/src/fs/io/FileOutputStream.hxx
+++ b/src/fs/io/FileOutputStream.hxx
@@ -35,7 +35,7 @@
 #include "util/Compiler.h"

 #ifndef _WIN32
-#include "system/FileDescriptor.hxx"
+#include "io/FileDescriptor.hxx"
 #endif

 #include <cassert>
--- a/src/fs/io/FileReader.cxx
+++ b/src/fs/io/FileReader.cxx
@@ -30,7 +30,7 @@
 #include "FileReader.hxx"
 #include "fs/FileInfo.hxx"
 #include "system/Error.hxx"
-#include "system/Open.hxx"
+#include "io/Open.hxx"

 #include <cassert>

--- a/src/fs/io/FileReader.hxx
+++ b/src/fs/io/FileReader.hxx
@@ -37,7 +37,7 @@
 #ifdef _WIN32
 #include <windows.h>
 #else
-#include "system/UniqueFileDescriptor.hxx"
+#include "io/UniqueFileDescriptor.hxx"
 #endif

 class Path;
--- a/src/fs/meson.build
+++ b/src/fs/meson.build
@@ -48,6 +48,7 @@ fs = static_library(
 fs_dep = declare_dependency(
  link_with: fs,
  dependencies: [
+    io_dep,
    system_dep,
    icu_dep,
    shlwapi_dep,