paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-01 23:09:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

* also force utf-8 on Solaris, nl_langinfo(CODESET) doesn't work there

Browse Source 
either and utf-8 is also its default "international" encoding

git-svn-id: trunk@7660 -
This commit is contained in:
Jonas Maebe 2007-06-14 10:56:29 +00:00
parent 7934961490
commit 6111e3e2b9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtl/unix/cwstring.pp
View File

@ -373,17 +373,17 @@ initialization
SetCWideStringManager;
initcriticalsection(iconv_lock);
{ init conversion tables }
{$ifndef darwin}
{$if not defined(darwin) and not defined(solaris)}}
iconv_wide2ansi:=iconv_open(nl_langinfo(CODESET),unicode_encoding);
iconv_ansi2wide:=iconv_open(unicode_encoding,nl_langinfo(CODESET));
iconv_ucs42ansi:=iconv_open(nl_langinfo(CODESET),'UCS4');
iconv_ansi2ucs4:=iconv_open('UCS4',nl_langinfo(CODESET));
{$else darwin}
{$else darwin or solaris}
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}
{$endif darwin or solaris}
finalization
donecriticalsection(iconv_lock);
iconv_close(iconv_ansi2wide);