paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-19 22:29:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

lazutils: fixed compilation on win64

Browse Source 
git-svn-id: branches/fixes_1_4@47880 -
This commit is contained in:
mattias 2015-02-18 16:53:12 +00:00
parent 53eedaa08b
commit 3cb4d0a391
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/lazutils/lazfileutils.inc
View File

@ -238,7 +238,7 @@ Type
var
CompareFunc: function(const Item1, Item2: String): Integer;
CompareFunc: function(const Item1, Item2: String): PtrInt;
SourceRoot, DestRoot, CmpDest, CmpSource: String;
CmpDestLen, CmpSourceLen, DestCount, SourceCount, i,
SharedFolders, LevelsBack, LevelsUp: Integer;

20
components/lazutils/lazutf8.pas
View File

@ -124,11 +124,11 @@ procedure AssignUTF8ListToAnsi(UTF8List, AnsiList: TStrings);
//compare functions
function UTF8CompareStr(const S1, S2: string): Integer; inline;
function UTF8CompareStrP(S1, S2: PChar): Integer;
function UTF8CompareStr(S1: PChar; Count1: SizeInt; S2: PChar; Count2: SizeInt): Integer;
function UTF8CompareText(const S1, S2: string): Integer;
function UTF8CompareStrCollated(const S1, S2: string): Integer;
function UTF8CompareStr(const S1, S2: string): PtrInt; inline;
function UTF8CompareStrP(S1, S2: PChar): PtrInt;
function UTF8CompareStr(S1: PChar; Count1: SizeInt; S2: PChar; Count2: SizeInt): PtrInt;
function UTF8CompareText(const S1, S2: string): PtrInt;
function UTF8CompareStrCollated(const S1, S2: string): PtrInt;
function CompareStrListUTF8LowerCase(List: TStringList; Index1, Index2: Integer): Integer;
type
@ -2855,19 +2855,19 @@ end;
Returns: < 0 if S1 < S2, 0 if S1 = S2, > 0 if S2 > S1.
Compare 2 UTF8 encoded strings, case sensitive.
------------------------------------------------------------------------------}
function UTF8CompareStr(const S1, S2: string): Integer;
function UTF8CompareStr(const S1, S2: string): PtrInt;
begin
Result := UTF8CompareStr(PChar(Pointer(S1)),length(S1),
PChar(Pointer(S2)),length(S2));
end;
function UTF8CompareStrP(S1, S2: PChar): Integer;
function UTF8CompareStrP(S1, S2: PChar): PtrInt;
begin
Result:=UTF8CompareStr(S1,StrLen(S1),S2,StrLen(S2));
end;
function UTF8CompareStr(S1: PChar; Count1: SizeInt; S2: PChar; Count2: SizeInt
): Integer;
): PtrInt;
var
Count: SizeInt;
begin
@ -2894,7 +2894,7 @@ end;
Note: Use this function instead of AnsiCompareText.
This function guarantees proper collation on all supported platforms.
------------------------------------------------------------------------------}
function UTF8CompareText(const S1, S2: string): Integer;
function UTF8CompareText(const S1, S2: string): PtrInt;
var
S1Lower, S2Lower: string;
begin
@ -2903,7 +2903,7 @@ begin
Result := UTF8CompareStr(S1Lower, S2Lower);
end;
function UTF8CompareStrCollated(const S1, S2: string): Integer;
function UTF8CompareStrCollated(const S1, S2: string): PtrInt;
begin
{$IFDEF MSWINDOWS}
Result := AnsiCompareStr(UTF8ToSys(S1), UTF8ToSys(S2));