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

Put GetFullName functions inside $ifdef FPC_WIDESTRING_EQUAL_UNICODESTRING

Browse Source 
git-svn-id: trunk@47287 -
This commit is contained in:
pierre 2020-11-03 07:13:59 +00:00
parent d5e20fa6a9
commit e80b1d9e70
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/inc/file.inc
View File

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

4
rtl/inc/systemh.inc
View File

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

2
rtl/inc/text.inc
View File

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