paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-02 22:27:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fix compilation failure after r32262

Browse Source 
git-svn-id: trunk@32270 -
This commit is contained in:
Tomas Hajny 2015-11-08 00:41:00 +00:00
parent 0ff87336aa
commit 2c566ffcb9
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rtl/os2/sysucode.inc
View File

@ -1261,11 +1261,21 @@ begin
{ UniStrColl interprets null chars as end-of-string -> filter out }
HS1 := NoNullsUnicodeString (S1);
HS2 := NoNullsUnicodeString (S2);
if coIgnoreCase in Options then
begin
(*
if coLingIgnoreCase in Options then
begin
HS1:=OS2UpperUnicodeString(HS1);
HS2:=OS2UpperUnicodeString(HS2);
end;
{$WARNING TODO: Exclude null characters and convert to uppercase in one-pass}
end
else
*)
if coIgnoreCase in Options then
begin
HS1:=OS2UpperUnicodeString(HS1);
HS2:=OS2UpperUnicodeString(HS2);
{$WARNING TODO: Exclude null characters and convert to uppercase in one-pass}
end;
Result := Sys_UniStrColl (DefLocObj, PWideChar (HS1), PWideChar (HS2));
if Result < -1 then
Result := -1
@ -1274,12 +1284,14 @@ begin
end;
(*
function OS2CompareTextUnicodeString (const S1, S2: UnicodeString): PtrInt;
begin
Result := OS2CompareUnicodeString (OS2UpperUnicodeString (S1),
OS2UpperUnicodeString (S2));
{$WARNING Language independent uppercase routine may not be appropriate for language dependent case insensitive comparison!}
end;
*)
function OS2UpperAnsiString (const S: AnsiString): AnsiString;
@ -1362,7 +1374,8 @@ var
I, MaxLen: PtrUInt;
begin
if UniAPI then
Result := OS2CompareUnicodeString (UnicodeString (S1), UnicodeString (S2))
Result := OS2CompareUnicodeString (UnicodeString (S1), UnicodeString (S2),
[])
else
(* Older OS/2 versions without Unicode support do not provide direct means *)
(* for case sensitive and codepage and language-aware string comparison. *)
@ -1450,8 +1463,8 @@ var
I: PtrUInt;
begin
if UniAPI then
Result := OS2CompareTextUnicodeString (UnicodeString (S1),
UnicodeString (S2))
Result := OS2CompareUnicodeString (UnicodeString (S1), UnicodeString (S2),
[coIgnoreCase])
else
begin
(* Let's use collation strings here as a fallback *)