From 73bd6af0f9f1ce9c535ff0a4227e29df3631eb45 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 22 Jun 2015 22:20:10 +0200 Subject: 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. --- src/fs/Charset.cxx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/fs/Charset.cxx') 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 -- cgit v1.2.3