aboutsummaryrefslogtreecommitdiffstats
path: root/src/fs/Charset.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-06-22 22:20:10 +0200
committerMax Kellermann <max@duempel.org>2015-06-22 22:20:10 +0200
commit73bd6af0f9f1ce9c535ff0a4227e29df3631eb45 (patch)
tree43f864c635b5fa76679e027103e524c75d474b82 /src/fs/Charset.cxx
parent2aa54c53653abda99c72bfb007c3442a1c3c6d60 (diff)
downloadmpd-73bd6af0f9f1ce9c535ff0a4227e29df3631eb45.tar.gz
mpd-73bd6af0f9f1ce9c535ff0a4227e29df3631eb45.tar.xz
mpd-73bd6af0f9f1ce9c535ff0a4227e29df3631eb45.zip
fs/Charset: hard-code Windows to ACP
Don't define HAVE_FS_CHARSET, and make GetFSCharset() return "ACP" instead of "UTF-8". Ignore the configuration setting, which had no effect anyway.
Diffstat (limited to 'src/fs/Charset.cxx')
-rw-r--r--src/fs/Charset.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/fs/Charset.cxx b/src/fs/Charset.cxx
index b25615d42..186670ff8 100644
--- a/src/fs/Charset.cxx
+++ b/src/fs/Charset.cxx
@@ -71,6 +71,8 @@ GetFSCharset()
{
#ifdef HAVE_FS_CHARSET
return fs_charset.empty() ? "UTF-8" : fs_charset.c_str();
+#elif defined(WIN32)
+ return "ACP";
#else
return "UTF-8";
#endif