Bladeren bron

* Allow to work with unicodertl

Michael VAN CANNEYT 2 jaren geleden
bovenliggende
commit
10b66491ba
3 gewijzigde bestanden met toevoegingen van 9 en 4 verwijderingen
  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+}
 program fpmake;
 
-uses {$ifdef unix}cthreads,{$endif} sysutils, Classes, fpmkunit;
+uses {$ifdef unix}cwstring,cthreads,{$endif} sysutils, Classes, fpmkunit;
 
 Var
   TBuild,T : TTarget;

+ 6 - 1
packages/fpmkunit/fpmake.pp

@@ -2,7 +2,12 @@
 {$mode objfpc}{$H+}
 program fpmake;
 
-uses {$ifdef unix}cthreads,{$endif} fpmkunit;
+uses
+  {$ifdef unix}
+  cwstring,
+  cthreads,
+  {$endif}
+  fpmkunit;
 
 Var
   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 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
   BufSize = 1024;
@@ -3008,7 +3008,7 @@ end;
 
 // 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
   Args : TStrings;