Skip to content

M
mpd
Commit bf4ee48e authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

ConfigPath: move path_domain to system/Path.cxx

parent 08e6d222
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
src/ConfigPath.cxx
View file @ bf4ee48e
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "ConfigPath.hxx" #include "ConfigPath.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx"
#include "ConfigGlobal.hxx" #include "ConfigGlobal.hxx"
#include "ConfigOption.hxx" #include "ConfigOption.hxx"
...@@ -49,8 +48,6 @@ ...@@ -49,8 +48,6 @@
#include <windows.h> #include <windows.h>
#endif #endif
static constexpr Domain path_domain("path");
Path Path
ParsePath(const char *path, Error &error) ParsePath(const char *path, Error &error)
{ {
......
src/fs/Path.cxx
View file @ bf4ee48e
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "ConfigGlobal.hxx" #include "ConfigGlobal.hxx"
#include "system/FatalError.hxx" #include "system/FatalError.hxx"
#include "util/Domain.hxx"
#include "gcc.h" #include "gcc.h"
#include <glib.h> #include <glib.h>
...@@ -46,6 +47,8 @@ ...@@ -46,6 +47,8 @@
*/ */
#define MPD_PATH_MAX_UTF8 ((MPD_PATH_MAX - 1) * 4 + 1) #define MPD_PATH_MAX_UTF8 ((MPD_PATH_MAX - 1) * 4 + 1)
const Domain path_domain("path");
std::string fs_charset; std::string fs_charset;
std::string Path::ToUTF8(const_pointer path_fs) std::string Path::ToUTF8(const_pointer path_fs)
......
src/fs/Path.hxx
View file @ bf4ee48e
...@@ -44,6 +44,8 @@ ...@@ -44,6 +44,8 @@
# endif # endif
#endif #endif
extern const class Domain path_domain;
/** /**
* A path name in the native file system character set. * A path name in the native file system character set.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment