system/FileDescriptor: move to io/

meson.build

@@ -331,6 +331,7 @@ endif
 
 subdir('src/util')
 subdir('src/time')
+subdir('src/io')
 subdir('src/system')
 subdir('src/thread')
 subdir('src/net')

src/db/update/InotifySource.cxx

@@ -19,7 +19,7 @@
 
 #include "InotifySource.hxx"
 #include "InotifyDomain.hxx"
-#include "system/FileDescriptor.hxx"
+#include "io/FileDescriptor.hxx"
 #include "system/FatalError.hxx"
 #include "system/Error.hxx"
 #include "Log.hxx"

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>

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>

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>
 

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;

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,

src/input/plugins/FileInputPlugin.cxx

@@ -22,7 +22,7 @@
 #include "fs/Path.hxx"
 #include "fs/FileInfo.hxx"
 #include "fs/io/FileReader.hxx"
-#include "system/FileDescriptor.hxx"
+#include "io/FileDescriptor.hxx"
 #include "util/RuntimeError.hxx"
 
 #include <sys/stat.h>

src/io/Open.cxx

@@ -28,8 +28,8 @@
  */
 
 #include "Open.hxx"
-#include "Error.hxx"
 #include "UniqueFileDescriptor.hxx"
+#include "system/Error.hxx"
 
 #include <fcntl.h>
 

src/io/meson.build

@@ -0,0 +1,10 @@
+io = static_library(
+  'io',
+  'FileDescriptor.cxx',
+  'Open.cxx',
+  include_directories: inc,
+)
+
+io_dep = declare_dependency(
+  link_with: io,
+)

src/mixer/plugins/OssMixerPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "mixer/MixerInternal.hxx"
 #include "config/Block.hxx"
-#include "system/FileDescriptor.hxx"
+#include "io/FileDescriptor.hxx"
 #include "system/Error.hxx"
 #include "util/ASCII.hxx"
 #include "util/Domain.hxx"

src/net/SocketDescriptor.hxx

@@ -31,7 +31,7 @@
 #define SOCKET_DESCRIPTOR_HXX
 
 #include "Features.hxx"
-#include "system/FileDescriptor.hxx"
+#include "io/FileDescriptor.hxx"
 
 #include <type_traits>
 

src/output/plugins/OssOutputPlugin.cxx

@@ -20,7 +20,7 @@
 #include "OssOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "mixer/MixerList.hxx"
-#include "system/UniqueFileDescriptor.hxx"
+#include "io/UniqueFileDescriptor.hxx"
 #include "system/Error.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/Domain.hxx"

src/output/plugins/SolarisOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "SolarisOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "system/FileDescriptor.hxx"
+#include "io/FileDescriptor.hxx"
 #include "system/Error.hxx"
 
 #include <cerrno>

src/system/EpollFD.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2013-2020 Max Kellermann <max.kellermann@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
 #ifndef EPOLL_FD_HXX
 #define EPOLL_FD_HXX
 
-#include "UniqueFileDescriptor.hxx"
+#include "io/UniqueFileDescriptor.hxx"
 
 #include <cstdint>
 

src/system/EventFD.hxx

@@ -30,7 +30,7 @@
 #ifndef EVENT_FD_HXX
 #define EVENT_FD_HXX
 
-#include "UniqueFileDescriptor.hxx"
+#include "io/UniqueFileDescriptor.hxx"
 
 /**
  * A class that wraps eventfd().

src/system/EventPipe.cxx

@@ -18,7 +18,7 @@
  */
 
 #include "EventPipe.hxx"
-#include "FileDescriptor.hxx"
+#include "io/FileDescriptor.hxx"
 #include "system/Error.hxx"
 #include "util/Compiler.h"
 

src/system/SignalFD.hxx

@@ -30,7 +30,7 @@
 #ifndef SIGNAL_FD_HXX
 #define SIGNAL_FD_HXX
 
-#include "UniqueFileDescriptor.hxx"
+#include "io/UniqueFileDescriptor.hxx"
 
 #include <csignal>
 

src/system/meson.build

@@ -1,7 +1,5 @@
 system_sources = [
   'FatalError.cxx',
-  'FileDescriptor.cxx',
-  'Open.cxx',
   'EventPipe.cxx',
   'Clock.cxx',
 ]
@@ -29,6 +27,7 @@ endif
 system_dep = declare_dependency(
   link_with: system,
   dependencies: [
+    io_dep,
     winsock_dep,
   ],
 )

test/run_filter.cxx

@@ -28,7 +28,7 @@
 #include "pcm/Volume.hxx"
 #include "mixer/MixerControl.hxx"
 #include "system/Error.hxx"
-#include "system/FileDescriptor.hxx"
+#include "io/FileDescriptor.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/StringBuffer.hxx"
 #include "util/RuntimeError.hxx"