From 520e81f98d7560cb39a9141c698723e2e36aa675 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Tue, 26 Jan 2016 19:37:18 +0000 Subject: Alloc specifying local charset on OS3 as we can't get this from Locale --- amiga/utf8.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'amiga/utf8.c') diff --git a/amiga/utf8.c b/amiga/utf8.c index 9bf1b1adb..91d7c90c0 100755 --- a/amiga/utf8.c +++ b/amiga/utf8.c @@ -23,6 +23,7 @@ #include #include +#include "utils/nsoption.h" #include "utils/utf8.h" #include "desktop/gui_utf8.h" @@ -37,6 +38,8 @@ nserror utf8_from_local_encoding(const char *string, size_t len, char **result) charset = GetDiskFontCtrl(DFCTRL_CHARSET); encname = (const char *) ObtainCharsetInfo(DFCS_NUMBER, charset, DFCS_MIMENAME); +#else + encname = nsoption_charp(local_charset); #endif return utf8_from_enc(string,encname,len,result,NULL); @@ -51,6 +54,8 @@ nserror utf8_to_local_encoding(const char *string, size_t len, char **result) charset = GetDiskFontCtrl(DFCTRL_CHARSET); encname = (const char *) ObtainCharsetInfo(DFCS_NUMBER, charset, DFCS_MIMENAME); +#else + encname = nsoption_charp(local_charset); #endif return utf8_to_enc(string,encname,len,result); @@ -96,3 +101,4 @@ static struct gui_utf8_table utf8_table = { }; struct gui_utf8_table *amiga_utf8_table = &utf8_table; + -- cgit v1.2.3