Fix default for --enable-non-utf8

diff --git a/configure.ac b/configure.ac
index cc673ef50b8be2260738729b5a85d84040b8e3d2..e4d1ffbec33d997cc94dc984d3aa834d9409bd4f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -903,8 +903,8 @@ AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
 
 dnl Manual switch for UTF-8
 AC_ARG_ENABLE(non-utf8,
-  [  --enable-non-utf8       Legacy non-UTF-8 systems support (default disabled)], [
-  AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [
+  [  --enable-non-utf8       Legacy non-UTF-8 systems support (default disabled)],, [
+  AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
     enable_non_utf8="no"
   ])
 ])

diff --git a/src/text/unicode.c b/src/text/unicode.c
index a9c9e9508e1eb8970f8c79c65ced48c00189b08f..b9b0c49f7602912a5c6e2b174286cab91236a094 100644 (file)
--- a/src/text/unicode.c
+++ b/src/text/unicode.c
@@ -173,7 +173,7 @@ char *ToLocale (const char *utf8)
 #ifdef ASSUME_UTF8
     return (char *)utf8;
 #else
-    return utf8 ? locale_fast (utf8, false) : NULL
+    return utf8 ? locale_dup (utf8, false) : NULL;
 #endif
 }