浏览代码

* Allow to work with unicodertl

Michael VAN CANNEYT 2 年之前
父节点
当前提交
10b66491ba
共有 3 个文件被更改,包括 9 次插入4 次删除
  1. 1 1
      packages/fpmake.pp
  2. 6 1
      packages/fpmkunit/fpmake.pp
  3. 2 2
      packages/fpmkunit/src/fpmkunit.pp

+ 1 - 1
packages/fpmake.pp

@@ -4,7 +4,7 @@
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 program fpmake;
 program fpmake;
 
 
-uses {$ifdef unix}cthreads,{$endif} sysutils, Classes, fpmkunit;
+uses {$ifdef unix}cwstring,cthreads,{$endif} sysutils, Classes, fpmkunit;
 
 
 Var
 Var
   TBuild,T : TTarget;
   TBuild,T : TTarget;

+ 6 - 1
packages/fpmkunit/fpmake.pp

@@ -2,7 +2,12 @@
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 program fpmake;
 program fpmake;
 
 
-uses {$ifdef unix}cthreads,{$endif} fpmkunit;
+uses
+  {$ifdef unix}
+  cwstring,
+  cthreads,
+  {$endif}
+  fpmkunit;
 
 
 Var
 Var
   P : TPackage;
   P : TPackage;

+ 2 - 2
packages/fpmkunit/src/fpmkunit.pp

@@ -2964,7 +2964,7 @@ end;
   If ReadStdErr is True, return stderr output if stdout is empty
   If ReadStdErr is True, return stderr output if stdout is empty
   If EmptyIfStdErr, return empty string if stderr output is not empty }
   If EmptyIfStdErr, return empty string if stderr output is not empty }
 
 
-function GetCompilerInfo(const ACompiler:string; Args : TStrings; ReadStdErr: boolean;EmptyIfStdErr : boolean):string;
+function GetCompilerInfo(const ACompiler:string; Args : TStrings; ReadStdErr: boolean;EmptyIfStdErr : boolean):ansistring;
 
 
 const
 const
   BufSize = 1024;
   BufSize = 1024;
@@ -3008,7 +3008,7 @@ end;
 
 
 // Convenience function
 // Convenience function
 
 
-function GetCompilerInfo(const ACompiler:string; aOptions : Array of String; ReadStdErr: boolean;EmptyIfStdErr : boolean):string;
+function GetCompilerInfo(const ACompiler:string; aOptions : Array of String; ReadStdErr: boolean;EmptyIfStdErr : boolean):ansistring;
 
 
 Var
 Var
   Args : TStrings;
   Args : TStrings;