paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 02:49:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* provide possibility of reusing the routine from system WideStringManager for retrieval of current codepage on non-Windows and non-Unix

Browse Source 
git-svn-id: trunk@29623 -
This commit is contained in:
Tomas Hajny 2015-02-04 01:39:54 +00:00
parent 329f788f58
commit 09e6069024
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rtl/objpas/fpwidestring.pp
View File

@ -785,7 +785,7 @@ begin
DefaultUnicodeCodePage:=CP_UTF16; DefaultUnicodeCodePage:=CP_UTF16;
{$ifdef MSWINDOWS} {$ifdef MSWINDOWS}
DefaultSystemCodePage:=GetACP(); DefaultSystemCodePage:=GetACP();
{$endif MSWINDOWS} {$ELSE MSWINDOWS}
{$ifdef UNIX} {$ifdef UNIX}
DefaultSystemCodePage:=GetSystemCodepage; DefaultSystemCodePage:=GetSystemCodepage;
if (DefaultSystemCodePage = CP_NONE) then if (DefaultSystemCodePage = CP_NONE) then
@ -796,7 +796,15 @@ begin
DefaultFileSystemCodePage:=DefaultSystemCodepage; DefaultFileSystemCodePage:=DefaultSystemCodepage;
{$endif} {$endif}
DefaultRTLFileSystemCodePage:=DefaultFileSystemCodePage; DefaultRTLFileSystemCodePage:=DefaultFileSystemCodePage;
{$ELSE UNIX}
if Assigned (WideStringManager.GetStandardCodePageProc) then
DefaultSystemCodePage := WideStringManager.GetStandardCodePageProc (scpAnsi)
else
DefaultSystemCodePage := CP_NONE;
DefaultFileSystemCodePage := DefaultSystemCodePage;
DefaultRTLFileSystemCodePage := DefaultSystemCodePage;
{$endif UNIX} {$endif UNIX}
{$endif MSWINDOWS}
end; end;