[GExperts-Checkins] SF.net SVN: gexperts:[3271] trunk/ExternalSource/dzlib

[<tw...@us...>]

Revision: 3271
          http://sourceforge.net/p/gexperts/code/3271
Author:   twm
Date:     2020-08-01 17:16:11 +0000 (Sat, 01 Aug 2020)
Log Message:
-----------
* If UInt64 is not declared, don't implement IntToHex for it (Delphi 6)
* If NativeUInt is not declared, declare it as UInt32 (Delphi 6)

Modified Paths:
--------------
    trunk/ExternalSource/dzlib/u_dzMiscUtils.pas
    trunk/ExternalSource/dzlib/u_dzTypes.pas

Modified: trunk/ExternalSource/dzlib/u_dzMiscUtils.pas
===================================================================
--- trunk/ExternalSource/dzlib/u_dzMiscUtils.pas	2020-08-01 15:51:50 UTC (rev 3270)
+++ trunk/ExternalSource/dzlib/u_dzMiscUtils.pas	2020-08-01 17:16:11 UTC (rev 3271)
@@ -87,7 +87,9 @@
 {$ENDIF HAS_INTTOHEX_FUNCTION}
 
 {$IFNDEF HAS_INTTOHEX_FUNCTION_64}
+{$IFDEF SUPPORTS_UINT64}
 function IntToHex(_Value: UInt64): string; overload;
+{$ENDIF SUPPORTS_UINT64}
 {$ENDIF HAS_INTTOHEX_FUNCTION_64}
 
 function PtrToHex(_Value: Pointer): string;
@@ -536,6 +538,7 @@
 {$ENDIF HAS_INTTOHEX_FUNCTION}
 
 {$IFNDEF HAS_INTTOHEX_FUNCTION_64}
+{$IFDEF SUPPORTS_UINT64}
 function IntToHex(_Value: UInt64): string; overload;
 var
   Buf: PUInt32;
@@ -545,6 +548,7 @@
   Buf := PUInt32(@_Value);
   Result := Result + IntToHex(Buf^, 8);
 end;
+{$ENDIF SUPPORTS_UINT64}
 {$ENDIF HAS_INTTOHEX_FUNCTION_64}
 
 function PtrToHex(_Value: Pointer): string;

Modified: trunk/ExternalSource/dzlib/u_dzTypes.pas
===================================================================
--- trunk/ExternalSource/dzlib/u_dzTypes.pas	2020-08-01 15:51:50 UTC (rev 3270)
+++ trunk/ExternalSource/dzlib/u_dzTypes.pas	2020-08-01 17:16:11 UTC (rev 3271)
@@ -30,6 +30,9 @@
   UInt32 = Cardinal;
 {$IFEND}
   // Int64 is predefined
+{$IF not declared(UInt64)}
+  UInt64 = Int64;
+{$IFEND}
   // UInt64 is predefined
 
 {$IF not declared(PInt8)}
@@ -56,6 +59,11 @@
 {$IF not declared(PUInt64)}
   PUInt64 = ^UInt64;
 {$IFEND}
+
+{$IF not declared(NativeUInt)}
+  NativeUInt = UInt32;
+{$IFEND}
+
 type
   EdzException = class(Exception)
   end;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.