Browse Source

* PChar -> PAnsiChar

Michaël Van Canneyt 2 years ago
parent
commit
dcddd44cd9

File diff suppressed because it is too large
+ 390 - 290
packages/fppkg/src/fpmkunitsrc.inc


+ 1 - 1
packages/fppkg/src/fprepos.pp

@@ -721,7 +721,7 @@ begin
           PackageVariant.IsInheritable := True;
           end;
         PackageVariant.Name := PackageVariantName;
-        PackageVariant.Options := Copy(PackageVariantStr, pos(':', PackageVariantStr) +1).Split(',');
+        PackageVariant.Options := Copy(PackageVariantStr, pos(':', PackageVariantStr) +1).Split(RTLString(','));
         end;
       inc(i);
       until PackageVariantStr='';

+ 3 - 3
packages/fppkg/src/pkgfpmake.pp

@@ -121,14 +121,14 @@ procedure CreateFPMKUnitSource(const AFileName:string);
 var
   InStream,
   OutStream : TStream;
-  pend      : pchar;
+  pend      : PChar;
 begin
   try
     // Don't write trailing #0
-    pend:=pchar(@fpmkunitsrc)+sizeof(fpmkunitsrc)-1;
+    pend:=PChar(@fpmkunitsrc)+sizeof(fpmkunitsrc)-1;
     while pend^=#0 do
       dec(pend);
-    InStream:=TMyMemoryStream.Create(@fpmkunitsrc,pend-pchar(@fpmkunitsrc));
+    InStream:=TMyMemoryStream.Create(@fpmkunitsrc,pend-PChar(@fpmkunitsrc));
     OutStream:=TFileStream.Create(AFileName,fmCreate);
     OutStream.CopyFrom(InStream,InStream.Size);
   finally

+ 1 - 1
packages/fppkg/src/pkgglobals.pp

@@ -359,7 +359,7 @@ var
 {$ELSE USE_SHELL}
   S: TProcess;
 {$ENDIF USE_SHELL}
-  Buf: array [0..BufSize - 1] of char;
+  Buf: array [0..BufSize - 1] of AnsiChar;
   Count: longint;
 begin
 {$IFDEF USE_SHELL}

+ 1 - 1
packages/fppkg/src/pkghandler.pp

@@ -172,7 +172,7 @@ var
     n: longint;
     BuffPos: longint;
     sLine: string;
-    ch: char;
+    ch: AnsiChar;
   begin
     // make sure we have room
     ConsoleOutput.SetSize(BytesRead + READ_BYTES);

+ 1 - 1
packages/fppkg/src/pkgmkconv.pp

@@ -65,7 +65,7 @@ uses
   pkgglobals,
   pkgmessages;
 
-Function GetWord(var S : String; Sep : Char) : String;
+Function GetWord(var S : String; Sep : AnsiChar) : String;
 
 Var
   L : Integer;

Some files were not shown because too many files changed in this diff