瀏覽代碼

* protect GetFullName with FPC_HAS_FEATURE_UNICODESTRINGS instead of _WIDESTRINGS

git-svn-id: trunk@47294 -
svenbarth 4 年之前
父節點
當前提交
ac36eec71a
共有 3 個文件被更改,包括 8 次插入8 次删除
  1. 2 2
      rtl/inc/file.inc
  2. 4 4
      rtl/inc/systemh.inc
  3. 2 2
      rtl/inc/text.inc

+ 2 - 2
rtl/inc/file.inc

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

+ 4 - 4
rtl/inc/systemh.inc

@@ -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}
 
 {****************************************************************************

+ 2 - 2
rtl/inc/text.inc

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