diff options
| author | Max Kellermann <max@duempel.org> | 2014-11-30 00:27:58 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-11-30 00:27:58 +0100 |
| commit | 6987f2ba82ca2205efa5a0ff9088f4555fe607c1 (patch) | |
| tree | 846f1d29804067e78ba764a6e3d4e4749b09759a | |
| parent | 563db580aea58769b9410b687dcfe038dcefce60 (diff) | |
| download | mpd-6987f2ba82ca2205efa5a0ff9088f4555fe607c1.tar.gz mpd-6987f2ba82ca2205efa5a0ff9088f4555fe607c1.tar.xz mpd-6987f2ba82ca2205efa5a0ff9088f4555fe607c1.zip | |
fs/Charset: use macro HAVE_FS_CHARSET internally
| -rw-r--r-- | src/fs/Charset.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fs/Charset.cxx b/src/fs/Charset.cxx index 065ba9a12..c98170c24 100644 --- a/src/fs/Charset.cxx +++ b/src/fs/Charset.cxx @@ -35,7 +35,7 @@ #include <assert.h> #include <string.h> -#ifdef HAVE_GLIB +#ifdef HAVE_FS_CHARSET static constexpr Domain convert_domain("convert"); @@ -121,13 +121,13 @@ PathToUTF8(const char *path_fs) { assert(path_fs != nullptr); -#ifdef HAVE_GLIB +#ifdef HAVE_FS_CHARSET if (fs_charset.empty()) { #endif auto result = std::string(path_fs); FixSeparators(result); return result; -#ifdef HAVE_GLIB +#ifdef HAVE_FS_CHARSET } GIConv conv = g_iconv_open("utf-8", fs_charset.c_str()); @@ -155,7 +155,7 @@ PathToUTF8(const char *path_fs) #endif } -#ifdef HAVE_GLIB +#ifdef HAVE_FS_CHARSET char * PathFromUTF8(const char *path_utf8) |