From 54e561dfa4c63ecc0333c529655c4479da0af9f5 Mon Sep 17 00:00:00 2001
From: sergei <gorelkin@nanoreflex.ru>
Date: Mon, 10 Mar 2014 20:18:30 +0000
Subject: [PATCH] * Assign CharLengthPCharProc and CodePointLengthProc always
 in initunicodestringmanager, doing it in initwidestringmanager only
 complicates things.

git-svn-id: trunk@27086 -
---
 rtl/inc/ustrings.inc | 2 +-
 rtl/inc/wstrings.inc | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/rtl/inc/ustrings.inc b/rtl/inc/ustrings.inc
index 85503bdd74..c5c52b2f4d 100644
--- a/rtl/inc/ustrings.inc
+++ b/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}
diff --git a/rtl/inc/wstrings.inc b/rtl/inc/wstrings.inc
index b8bab978b9..54e8acf9c5 100644
--- a/rtl/inc/wstrings.inc
+++ b/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;