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.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fs/Charset.hxx') diff --git a/src/fs/Charset.hxx b/src/fs/Charset.hxx index 49ad07820..9d119fea7 100644 --- a/src/fs/Charset.hxx +++ b/src/fs/Charset.hxx @@ -24,7 +24,7 @@ #include "Compiler.h" #include "Traits.hxx" -#if defined(HAVE_ICU) || defined(HAVE_GLIB) +#if (defined(HAVE_ICU) || defined(HAVE_GLIB)) && !defined(WIN32) #define HAVE_FS_CHARSET #endif -- cgit v1.2.3