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

git-svn-id: trunk@27086 -

rtl/inc/ustrings.inc

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

rtl/inc/wstrings.inc

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