From 6987f2ba82ca2205efa5a0ff9088f4555fe607c1 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 30 Nov 2014 00:27:58 +0100 Subject: fs/Charset: use macro HAVE_FS_CHARSET internally --- src/fs/Charset.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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 #include -#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) -- cgit v1.2.3