Browse Source

* Move basenenc back to fcl-base, sysutils is needed

(cherry picked from commit 7626af634cda98ad94382694867e105e70ee5ff9)
Michaël Van Canneyt 3 năm trước cách đây
mục cha
commit
f6e7ee1212

+ 1 - 0
packages/fcl-base/fpmake.pp

@@ -139,6 +139,7 @@ begin
     P.Sources.AddSrcFiles('src/win/fclel.*', P.Directory);
     // Install windows resources
     P.InstallFiles.Add('src/win/fclel.res',AllWindowsOSes,'$(unitinstalldir)');
+    T:=P.Targets.addUnit('basenenc.pp');
 
     // Examples
     P.ExamplePath.Add('examples');

+ 4 - 3
packages/rtl-extra/src/inc/basenenc.pp → packages/fcl-base/src/basenenc.pp

@@ -19,9 +19,10 @@ unit basenenc;
 
 interface
 
-uses Types, SysUtils;
+uses SysUtils;
 
 Type
+  TBytes = Array of Byte;
 
   { TAlphabetEncoder }
   TReverseAlphabet = Array[0..255] of Byte;
@@ -42,7 +43,7 @@ Type
         'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_');
   Private
     FBits : Byte;
-    FAlphabet : TByteDynArray;
+    FAlphabet : TBytes;
     FReverse : TReverseAlphabet;
     FPadding : Integer;
     class var StdEncoders : Array[TStandardEncoder] of TAlphabetEncoder;
@@ -74,7 +75,7 @@ Type
     // Bits per characters
     Property Bits : Byte Read FBits;
     // ASCII value of characters
-    Property Alphabet : TByteDynArray Read FAlphabet;
+    Property Alphabet : TBytes Read FAlphabet;
     // Reverse byte->character map
     Property Reverse : TReverseAlphabet Read FReverse;
     // Bits of padding

+ 0 - 1
packages/rtl-extra/fpmake.pp

@@ -117,7 +117,6 @@ begin
       end;
 
     T:=P.Targets.AddUnit('objects.pp',ObjectsOSes);
-    T:=P.Targets.AddUnit('basenenc.pp');
 
     T:=P.Targets.AddUnit('printer.pp',PrinterOSes);
     T.Dependencies.AddInclude('printerh.inc',PrinterOSes);