Merge branch 'master' into patch-pointer

a4991d1b · Chen Bill · 7db891d6 · fe93928a · a4991d1b
Commit a4991d1b authored May 21, 2024 by Chen Bill
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

gframe/lzma/Types.h gframe/lzma/Types.h +6 -0

No files found.
--- a/gframe/lzma/Types.h
+++ b/gframe/lzma/Types.h
@@ -74,9 +74,15 @@ typedef unsigned long UInt64;

 #else

+#if defined(_MSC_VER) || defined(__BORLANDC__)
+typedef __int64 Int64;
+typedef unsigned __int64 UInt64;
+#define UINT64_CONST(n) n
+#else
 typedef long long int Int64;
 typedef unsigned long long int UInt64;
 #define UINT64_CONST(n) n ## ULL
+#endif

 #endif