diff options
| author | Max Kellermann <max@duempel.org> | 2013-09-12 10:03:37 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-09-12 10:03:37 +0200 |
| commit | bf4ee48efad262c650b6b1a5b61ebe837d59f910 (patch) | |
| tree | cd8edec4f95b14c1083c04143d5e39052a7197dc | |
| parent | 08e6d222a2dea2509baea0a19b754743374756d3 (diff) | |
| download | mpd-bf4ee48efad262c650b6b1a5b61ebe837d59f910.tar.gz mpd-bf4ee48efad262c650b6b1a5b61ebe837d59f910.tar.xz mpd-bf4ee48efad262c650b6b1a5b61ebe837d59f910.zip | |
ConfigPath: move path_domain to system/Path.cxx
| -rw-r--r-- | src/ConfigPath.cxx | 3 | ||||
| -rw-r--r-- | src/fs/Path.cxx | 3 | ||||
| -rw-r--r-- | src/fs/Path.hxx | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/ConfigPath.cxx b/src/ConfigPath.cxx index a1a73a63c..86f70dfd3 100644 --- a/src/ConfigPath.cxx +++ b/src/ConfigPath.cxx @@ -21,7 +21,6 @@ #include "ConfigPath.hxx" #include "fs/Path.hxx" #include "util/Error.hxx" -#include "util/Domain.hxx" #include "ConfigGlobal.hxx" #include "ConfigOption.hxx" @@ -49,8 +48,6 @@ #include <windows.h> #endif -static constexpr Domain path_domain("path"); - Path ParsePath(const char *path, Error &error) { diff --git a/src/fs/Path.cxx b/src/fs/Path.cxx index 7de19a582..c063025c8 100644 --- a/src/fs/Path.cxx +++ b/src/fs/Path.cxx @@ -21,6 +21,7 @@ #include "fs/Path.hxx" #include "ConfigGlobal.hxx" #include "system/FatalError.hxx" +#include "util/Domain.hxx" #include "gcc.h" #include <glib.h> @@ -46,6 +47,8 @@ */ #define MPD_PATH_MAX_UTF8 ((MPD_PATH_MAX - 1) * 4 + 1) +const Domain path_domain("path"); + std::string fs_charset; std::string Path::ToUTF8(const_pointer path_fs) diff --git a/src/fs/Path.hxx b/src/fs/Path.hxx index eaab2bde5..dd4cf38a7 100644 --- a/src/fs/Path.hxx +++ b/src/fs/Path.hxx @@ -44,6 +44,8 @@ # endif #endif +extern const class Domain path_domain; + /** * A path name in the native file system character set. */ |