paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-20 11:29:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

* android: Improved initialization of cwstring.

Browse Source 
git-svn-id: trunk@34407 -
This commit is contained in:
yury 2016-09-01 23:34:09 +00:00
parent a0d6873331
commit b552fc4595
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rtl/android/cwstring.pp
View File

@ -494,7 +494,7 @@ begin
Result:=True;
end;
procedure LoadICU;
function LoadICU: boolean;
const
ICUver: array [1..9] of ansistring = ('3_8', '4_2', '44', '46', '48', '50', '51', '53', '55');
TestProcName = 'ucnv_open';
@ -503,6 +503,7 @@ var
i: longint;
s: ansistring;
begin
Result:=False;
{$ifdef android}
hlibICU:=LoadLibrary('libicuuc.so');
hlibICUi18n:=LoadLibrary('libicui18n.so');
@ -564,19 +565,22 @@ begin
if not GetIcuProc('ucol_close', ucol_close, 1) then exit;
if not GetIcuProc('ucol_strcoll', ucol_strcoll, 1) then exit;
if not GetIcuProc('ucol_setStrength', ucol_setStrength, 1) then exit;
Result:=True;
end;
var
oldm: TUnicodeStringManager;
initialization
GetUnicodeStringManager(oldm);
DefaultSystemCodePage:=GetStandardCodePage(scpAnsi);
DefaultUnicodeCodePage:=CP_UTF16;
LoadICU;
SetCWideStringManager;
{$ifdef android}
SetStdIOCodePages;
{$endif android}
if LoadICU then begin
SetCWideStringManager;
{$ifdef android}
SetStdIOCodePages;
{$endif android}
end;
finalization
SetUnicodeStringManager(oldm);