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

+ Patch from Pete: Dont support widestrings when compiled with 1.0.x and Add additional typecasts to Widestring for widechar/pwidechar

Browse Source
This commit is contained in:
michael 2004-12-01 10:34:46 +00:00
parent 240c5a96c2
commit ff146b3d32
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rtl/objpas/sysutils/sysstr.inc
View File

@ -1039,15 +1039,17 @@ begin
if CheckArg(vtPChar,false) then if CheckArg(vtPChar,false) then
hs:=Args[doarg].VPChar hs:=Args[doarg].VPChar
else else
{$ifndef VER1_0}
if CheckArg(vtPWideChar,false) then if CheckArg(vtPWideChar,false) then
hs:=Args[doarg].VPWideChar hs:=WideString(Args[doarg].VPWideChar)
else else
if CheckArg(vtWideChar,false) then if CheckArg(vtWideChar,false) then
hs:=Args[doarg].VWideChar hs:=WideString(Args[doarg].VWideChar)
else else
if CheckArg(vtWidestring,false) then if CheckArg(vtWidestring,false) then
hs:=WideString(Args[doarg].VWideString) hs:=WideString(Args[doarg].VWideString)
else else
{$endif VER1_0}
if CheckArg(vtAnsiString,true) then if CheckArg(vtAnsiString,true) then
hs:=ansistring(Args[doarg].VAnsiString); hs:=ansistring(Args[doarg].VAnsiString);
Index:=Length(hs); Index:=Length(hs);
@ -2234,7 +2236,10 @@ const
{ {
$Log$ $Log$
Revision 1.21 2004-11-30 20:56:27 michael Revision 1.22 2004-12-01 10:34:46 michael
+ Patch from Pete: Dont support widestrings when compiled with 1.0.x and Add additional typecasts to Widestring for widechar/pwidechar
Revision 1.21 2004/11/30 20:56:27 michael
+ Fix from Alexey Barkovoy for bug 3302 + Fix from Alexey Barkovoy for bug 3302
Revision 1.20 2004/11/22 05:53:44 marco Revision 1.20 2004/11/22 05:53:44 marco