--- Merging r31333 into '.':

U    rtl/unix/unixcp.pp
--- Recording mergeinfo for merge of r31333 into '.':
 U   .

# revisions: 31333

git-svn-id: branches/fixes_3_0@32229 -
This commit is contained in:
joost 2015-11-04 19:57:35 +00:00
parent 47963b9189
commit cfcf2f5b24

View File

@ -714,7 +714,7 @@ var
begin
// Get one of non-empty environment variables in the next order:
// LC_ALL, LC_CTYPE, LANG. Default is UTF-8 or ASCII.
{$if defined(linux) or defined(darwin)}
{$if defined(linux) or defined(darwin) or defined(haiku)}
Result:=CP_UTF8;
{$else}
Result:=CP_ASCII;