Browse Source

* force utf-8 for darwin

git-svn-id: trunk@7644 -
Jonas Maebe 18 years ago
parent
commit
8523bdc831
1 changed files with 7 additions and 0 deletions
  1. 7 0
      rtl/unix/cwstring.pp

+ 7 - 0
rtl/unix/cwstring.pp

@@ -373,10 +373,17 @@ initialization
   SetCWideStringManager;
   SetCWideStringManager;
   initcriticalsection(iconv_lock);
   initcriticalsection(iconv_lock);
   { init conversion tables }
   { init conversion tables }
+{$ifndef darwin}
   iconv_wide2ansi:=iconv_open(nl_langinfo(CODESET),unicode_encoding);
   iconv_wide2ansi:=iconv_open(nl_langinfo(CODESET),unicode_encoding);
   iconv_ansi2wide:=iconv_open(unicode_encoding,nl_langinfo(CODESET));
   iconv_ansi2wide:=iconv_open(unicode_encoding,nl_langinfo(CODESET));
   iconv_ucs42ansi:=iconv_open(nl_langinfo(CODESET),'UCS4');
   iconv_ucs42ansi:=iconv_open(nl_langinfo(CODESET),'UCS4');
   iconv_ansi2ucs4:=iconv_open('UCS4',nl_langinfo(CODESET));
   iconv_ansi2ucs4:=iconv_open('UCS4',nl_langinfo(CODESET));
+{$else darwin}
+  iconv_wide2ansi:=iconv_open('UTF-8',unicode_encoding);
+  iconv_ansi2wide:=iconv_open(unicode_encoding,'UTF-8');
+  iconv_ucs42ansi:=iconv_open('UTF-8','UCS4');
+  iconv_ansi2ucs4:=iconv_open('UCS4','UTF-8');
+{$endif darwin}
 finalization
 finalization
   donecriticalsection(iconv_lock);
   donecriticalsection(iconv_lock);
   iconv_close(iconv_ansi2wide);
   iconv_close(iconv_ansi2wide);