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

* Assign CharLengthPCharProc and CodePointLengthProc always in initunicodestringmanager, doing it in initwidestringmanager only complicates things.

Browse Source 
git-svn-id: trunk@27086 -
This commit is contained in:
sergei 2014-03-10 20:18:30 +00:00
parent ed1d5aab37
commit 54e561dfa4
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/inc/ustrings.inc
View File

@ -2324,9 +2324,9 @@ procedure initunicodestringmanager;
{$endif HAS_WIDESTRINGMANAGER} {$endif HAS_WIDESTRINGMANAGER}
widestringmanager.CompareWideStringProc:=@CompareUnicodeString; widestringmanager.CompareWideStringProc:=@CompareUnicodeString;
widestringmanager.CompareTextWideStringProc:=@CompareTextUnicodeString; widestringmanager.CompareTextWideStringProc:=@CompareTextUnicodeString;
{$endif FPC_WIDESTRING_EQUAL_UNICODESTRING}
widestringmanager.CharLengthPCharProc:=@DefaultCharLengthPChar; widestringmanager.CharLengthPCharProc:=@DefaultCharLengthPChar;
widestringmanager.CodePointLengthProc:=@DefaultCodePointLength; widestringmanager.CodePointLengthProc:=@DefaultCodePointLength;
{$endif FPC_WIDESTRING_EQUAL_UNICODESTRING}
widestringmanager.GetStandardCodePageProc:=@DefaultGetStandardCodePage; widestringmanager.GetStandardCodePageProc:=@DefaultGetStandardCodePage;
end; end;
{$endif FPC_HAS_BUILTIN_WIDESTR_MANAGER} {$endif FPC_HAS_BUILTIN_WIDESTR_MANAGER}

5
rtl/inc/wstrings.inc
View File

@ -979,9 +979,6 @@ function CompareTextWideString(const s1, s2 : WideString): PtrInt;
{$warnings on} {$warnings on}
function DefaultCharLengthPChar(const Str: PChar): PtrInt;forward;
function DefaultCodePointLength(const Str: PChar; MaxLookAead: PtrInt): Ptrint;forward;
procedure initwidestringmanager; procedure initwidestringmanager;
begin begin
@ -994,6 +991,4 @@ procedure initwidestringmanager;
{$endif HAS_WIDESTRINGMANAGER} {$endif HAS_WIDESTRINGMANAGER}
widestringmanager.CompareWideStringProc:=@CompareWideString; widestringmanager.CompareWideStringProc:=@CompareWideString;
widestringmanager.CompareTextWideStringProc:=@CompareTextWideString; widestringmanager.CompareTextWideStringProc:=@CompareTextWideString;
widestringmanager.CharLengthPCharProc:=@DefaultCharLengthPChar;
widestringmanager.CodePointLengthProc:=@DefaultCodePointLength;
end; end;