Pārlūkot izejas kodu

* Allow to work with unicodertl

Michael VAN CANNEYT 2 gadi atpakaļ
vecāks
revīzija
3b9906ed38
2 mainītis faili ar 8 papildinājumiem un 3 dzēšanām
  1. 6 1
      packages/fpmkunit/fpmake.pp
  2. 2 2
      packages/fpmkunit/src/fpmkunit.pp

+ 6 - 1
packages/fpmkunit/fpmake.pp

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

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

@@ -2965,7 +2965,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;
@@ -3009,7 +3009,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;