瀏覽代碼

* force utf-8 on iPhoneOS, because locale settings are absent/ignored there

git-svn-id: trunk@13066 -
Jonas Maebe 16 年之前
父節點
當前提交
afab9fb99c
共有 1 個文件被更改,包括 6 次插入0 次删除
  1. 6 0
      rtl/unix/cwstring.pp

+ 6 - 0
rtl/unix/cwstring.pp

@@ -701,8 +701,14 @@ end;
 
 procedure InitThread;
 begin
+{$if not(defined(darwin) and defined(arm))}
   iconv_wide2ansi:=iconv_open(nl_langinfo(CODESET),unicode_encoding2);
   iconv_ansi2wide:=iconv_open(unicode_encoding2,nl_langinfo(CODESET));
+{$else}
+  { Unix locale settings are ignored on iPhoneOS }
+  iconv_wide2ansi:=iconv_open('UTF-8',unicode_encoding2);
+  iconv_ansi2wide:=iconv_open(unicode_encoding2,'UTF-8');
+{$endif}
 end;