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

* adapted merge of r36461, so compilation works again

Browse Source 
git-svn-id: branches/fixes_3_0@36479 -
This commit is contained in:
nickysn 2017-06-10 16:56:29 +00:00
parent f9a1b21224
commit 34489b2730
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtl/objpas/fpwidestring.pp
View File

@ -680,7 +680,7 @@ end;
function StrLCompAnsiString(S1, S2: PAnsiChar; MaxLen: PtrUInt): PtrInt; function StrLCompAnsiString(S1, S2: PAnsiChar; MaxLen: PtrUInt): PtrInt;
begin begin
if (current_Collation.DataPtr=nil) then if (current_Collation=nil) then
exit(OldManager.StrLCompAnsiStringProc(s1,s2,MaxLen)); exit(OldManager.StrLCompAnsiStringProc(s1,s2,MaxLen));
if (MaxLen=0) then if (MaxLen=0) then
exit(0); exit(0);
@ -691,7 +691,7 @@ function CompareStrAnsiString(const S1, S2: ansistring): PtrInt;
var var
l1, l2 : PtrInt; l1, l2 : PtrInt;
begin begin
if (current_Collation.DataPtr=nil) then if (current_Collation=nil) then
exit(OldManager.CompareStrAnsiStringProc(s1,s2)); exit(OldManager.CompareStrAnsiStringProc(s1,s2));
if (Pointer(S1)=Pointer(S2)) then if (Pointer(S1)=Pointer(S2)) then
exit(0); exit(0);
@ -720,7 +720,7 @@ function StrCompAnsiString(S1, S2: PChar): PtrInt;
var var
l1,l2 : PtrInt; l1,l2 : PtrInt;
begin begin
if (current_Collation.DataPtr=nil) then if (current_Collation=nil) then
exit(OldManager.StrCompAnsiStringProc(s1,s2)); exit(OldManager.StrCompAnsiStringProc(s1,s2));
l1:=strlen(S1); l1:=strlen(S1);
l2:=strlen(S2); l2:=strlen(S2);