Sfoglia il codice sorgente

Put GetFullName functions inside $ifdef FPC_WIDESTRING_EQUAL_UNICODESTRING

git-svn-id: trunk@47287 -
pierre 4 anni fa
parent
commit
e80b1d9e70
3 ha cambiato i file con 8 aggiunte e 0 eliminazioni
  1. 2 0
      rtl/inc/file.inc
  2. 4 0
      rtl/inc/systemh.inc
  3. 2 0
      rtl/inc/text.inc

+ 2 - 0
rtl/inc/file.inc

@@ -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 - 0
rtl/inc/systemh.inc

@@ -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 - 0
rtl/inc/text.inc

@@ -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