paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-02-04 04:55:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

* protect GetFullName with FPC_HAS_FEATURE_UNICODESTRINGS instead of _WIDESTRINGS

Browse Source 
git-svn-id: trunk@47294 -
This commit is contained in:
svenbarth 2020-11-03 19:25:32 +00:00
parent a02d676b06
commit ac36eec71a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/inc/file.inc
View File

@ -681,7 +681,7 @@ Begin
End;
{$endif FPC_HAS_FEATURE_ANSISTRINGS}
{$ifdef FPC_HAS_FEATURE_WIDESTRINGS}
{$ifdef FPC_HAS_FEATURE_UNICODESTRINGS}
Function GetFullName(var f:File) : UnicodeString;
begin
{$ifdef USE_FILEREC_FULLNAME}
@ -691,5 +691,5 @@ Function GetFullName(var f:File) : UnicodeString;
{$endif USE_FILEREC_FULLNAME}
Result:=PFileTextRecChar(@FileRec(f).Name);
end;
{$endif FPC_HAS_FEATURE_WIDESTRINGS}
{$endif FPC_HAS_FEATURE_UNICODESTRINGS}

8
rtl/inc/systemh.inc
View File

@ -1379,9 +1379,9 @@ Procedure Seek(var f:File;Pos:Int64);
Function EOF(var f:File):Boolean;
Procedure Erase(var f:File);
Procedure Truncate (var F:File);
{$ifdef FPC_HAS_FEATURE_WIDESTRINGS}
{$ifdef FPC_HAS_FEATURE_UNICODESTRINGS}
Function GetFullName(var f:File) : UnicodeString;
{$endif FPC_HAS_FEATURE_WIDESTRINGS}
{$endif FPC_HAS_FEATURE_UNICODESTRINGS}
{$endif FPC_HAS_FEATURE_FILEIO}
@ -1441,9 +1441,9 @@ Procedure SetTextBuf(var f:Text; var Buf; Size:SizeInt);
Procedure SetTextLineEnding(var f:Text; Ending:string);
function GetTextCodePage(var T: Text): TSystemCodePage;
procedure SetTextCodePage(var T: Text; CodePage: TSystemCodePage);
{$ifdef FPC_HAS_FEATURE_WIDESTRINGS}
{$ifdef FPC_HAS_FEATURE_UNICODESTRINGS}
Function GetFullName(var T:Text) : UnicodeString;
{$endif FPC_HAS_FEATURE_WIDESTRINGS}
{$endif FPC_HAS_FEATURE_UNICODESTRINGS}
{$endif FPC_HAS_FEATURE_TEXTIO}
{****************************************************************************

4
rtl/inc/text.inc
View File

@ -2646,7 +2646,7 @@ begin
end;
{$endif FPC_WIDESTRING_EQUAL_UNICODESTRING}
{$ifdef FPC_HAS_FEATURE_WIDESTRINGS}
{$ifdef FPC_HAS_FEATURE_UNICODESTRINGS}
Function GetFullName(var t:Text) : UnicodeString;
begin
{$ifdef USE_FILEREC_FULLNAME}
@ -2656,7 +2656,7 @@ Function GetFullName(var t:Text) : UnicodeString;
{$endif USE_FILEREC_FULLNAME}
Result:=PFileTextRecChar(@TextRec(t).Name);
end;
{$endif FPC_HAS_FEATURE_WIDESTRINGS}
{$endif FPC_HAS_FEATURE_UNICODESTRINGS}
{*****************************************************************************
Initializing