Merge upstream

src/libraries/cryptolib4pascal/ClpBitConverter.pas

@@ -392,12 +392,7 @@ class function TBitConverter.ToString(const value: TCryptoLibByteArray): String;
 var
   LowVal: Int32;
 begin
-
-{$IFDEF DELPHIXE2_UP}
   LowVal := System.Low(value);
-{$ELSE}
-  LowVal := 0;
-{$ENDIF DELPHIXE2_UP}
   result := ToString(value, LowVal);
 end;
 
@@ -428,8 +423,6 @@ begin
     b := value[Index];
     System.Inc(Index);
 
-    // chArray[Idx] := GetHexValue(b div 16);
-    // chArray[Idx + 1] := GetHexValue(b mod 16);
     chArray[Idx] := GetHexValue(b shr 4);
     chArray[Idx + 1] := GetHexValue(b and 15);
     chArray[Idx + 2] := '-';
@@ -437,11 +430,7 @@ begin
     System.Inc(Idx, 3);
   end;
 
-{$IFDEF DELPHIXE2_UP}
   LowVal := System.Low(chArray);
-{$ELSE}
-  LowVal := 0;
-{$ENDIF DELPHIXE2_UP}
   System.SetString(result, PChar(@chArray[LowVal]), System.Length(chArray) - 1);
 
 end;

src/libraries/cryptolib4pascal/CryptoLib.inc

@@ -94,43 +94,17 @@
 {$DEFINE SUPPORT_TSTREAM_WRITE_BYTEARRAY_OVERLOAD}
 {$LEGACYIFEND ON}
 {$ZEROBASEDSTRINGS OFF}
-{$IFEND}
-
- // 2010 only
-{$IF CompilerVersion = 21.0}
-{$DEFINE DELPHI2010}
-{$IFEND}
-
-  // 2010 and Above
-{$IF CompilerVersion >= 21.0}
-{$DEFINE DELPHI2010_UP}
 {$IFEND}
 
   // XE and Above
 {$IF CompilerVersion >= 22.0}
 {$DEFINE DELPHIXE_UP}
-{$IFEND}
-
-  // XE2 and Above
-{$IF CompilerVersion >= 23.0}
-{$DEFINE DELPHIXE2_UP}
-{$DEFINE HAS_UNITSCOPE}
-{$IFEND}
-
-// XE3 and Below
-{$IF CompilerVersion <= 24.0}
-{$DEFINE DELPHIXE3_DOWN}
 {$IFEND}
 
  // XE4 and Above
 {$IF CompilerVersion >= 25.0}
 {$DEFINE DELPHIXE4_UP}
 {$DEFINE SHIFT_OVERFLOW_BUG_FIXED}
-{$IFEND}
-
-  // XE7 and Above
-{$IF CompilerVersion >= 28.0}
-{$DEFINE DELPHIXE7_UP}
 {$IFEND}
 
   // 10.2 Tokyo and Above
@@ -138,12 +112,6 @@
 {$DEFINE DELPHI10.2_TOKYO_UP}
 {$IFEND}
 
-  // 10.2 Tokyo and Above
-{$IFDEF DELPHI10.2_TOKYO_UP}
-{$WARN COMBINING_SIGNED_UNSIGNED OFF}
-{$WARN COMBINING_SIGNED_UNSIGNED64 OFF}
-{$ENDIF}
-
   // 10.2 Tokyo and Above
 {$IFNDEF DELPHI10.2_TOKYO_UP}
 {$MESSAGE ERROR 'This Library requires Delphi Tokyo or higher.'}

src/libraries/hashlib4pascal/HashLib.inc

@@ -98,11 +98,6 @@
 {$IF CompilerVersion >= 23.0}
 {$DEFINE DELPHIXE2_UP}
 {$DEFINE HAS_UNITSCOPE}
-{$IFEND}
-
-// XE3 and Below
-{$IF CompilerVersion <= 24.0}
-{$DEFINE DELPHIXE3_DOWN}
 {$IFEND}
 
  // XE4 and Above

src/libraries/hashlib4pascal/HlpBitConverter.pas

@@ -374,12 +374,7 @@ class function TBitConverter.ToString(const value: THashLibByteArray): String;
 var
   LowVal: Int32;
 begin
-
-{$IFDEF DELPHIXE2_UP}
   LowVal := System.Low(value);
-{$ELSE}
-  LowVal := 0;
-{$ENDIF DELPHIXE2_UP}
   result := ToString(value, LowVal);
 end;
 
@@ -410,8 +405,6 @@ begin
     b := value[Index];
     System.Inc(Index);
 
-    // chArray[Idx] := GetHexValue(b div 16);
-    // chArray[Idx + 1] := GetHexValue(b mod 16);
     chArray[Idx] := GetHexValue(b shr 4);
     chArray[Idx + 1] := GetHexValue(b and 15);
     chArray[Idx + 2] := '-';
@@ -419,11 +412,8 @@ begin
     System.Inc(Idx, 3);
   end;
 
-{$IFDEF DELPHIXE2_UP}
   LowVal := System.Low(chArray);
-{$ELSE}
-  LowVal := 0;
-{$ENDIF DELPHIXE2_UP}
+
   System.SetString(result, PChar(@chArray[LowVal]), System.Length(chArray) - 1);
 
 end;

src/libraries/hashlib4pascal/HlpGrindahl256.pas

@@ -190,13 +190,9 @@ begin
 
   System.SetLength(Fs_table_0, System.Length(s_master_table));
 
-{$IFDEF DELPHIXE2_UP}
   LowVal1 := System.Low(s_master_table);
   LowVal2 := System.Low(Fs_table_0);
-{$ELSE}
-  LowVal1 := 0;
-  LowVal2 := 0;
-{$ENDIF DELPHIXE2_UP}
+
   System.Move(s_master_table[LowVal1], Fs_table_0[LowVal2],
     System.SizeOf(s_master_table));
 

src/libraries/hashlib4pascal/HlpGrindahl512.pas

@@ -275,13 +275,9 @@ begin
 
   System.SetLength(Fs_table_0, System.Length(s_master_table));
 
-{$IFDEF DELPHIXE2_UP}
   LowVal1 := System.Low(s_master_table);
   LowVal2 := System.Low(Fs_table_0);
-{$ELSE}
-  LowVal1 := 0;
-  LowVal2 := 0;
-{$ENDIF DELPHIXE2_UP}
+
   System.Move(s_master_table[LowVal1], Fs_table_0[LowVal2],
     System.SizeOf(s_master_table));