From 62a8a4f497ff5862a13abb134b8d078eb2f03d66 Mon Sep 17 00:00:00 2001 From: Okladnoj Date: Sat, 30 May 2026 12:07:56 +0300 Subject: [PATCH] fix(vc6): Use UnsignedInt64 and %I64X to support VC6 compiler in BitFlags.h --- Generals/Code/GameEngine/Include/Common/BitFlags.h | 8 ++++---- GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Generals/Code/GameEngine/Include/Common/BitFlags.h b/Generals/Code/GameEngine/Include/Common/BitFlags.h index f0e91b7c99..3ef1f19d29 100644 --- a/Generals/Code/GameEngine/Include/Common/BitFlags.h +++ b/Generals/Code/GameEngine/Include/Common/BitFlags.h @@ -309,19 +309,19 @@ class BitFlags for (int chunk = numChunks - 1; chunk >= 0; --chunk) { - unsigned long long val = 0; + UnsignedInt64 val = 0; for (int bit = 0; bit < 64 && (chunk * 64 + bit) < NUMBITS; ++bit) { if (m_bits.test(chunk * 64 + bit)) - val |= (unsigned long long)(1) << bit; + val |= (UnsignedInt64)(1) << bit; } if (val != 0 || chunk == 0 || printedAny) { if (printedAny) - snprintf(chunkBuf, sizeof(chunkBuf), "%016llX", val); + snprintf(chunkBuf, sizeof(chunkBuf), "%016I64X", val); else - snprintf(chunkBuf, sizeof(chunkBuf), "%llX", val); + snprintf(chunkBuf, sizeof(chunkBuf), "%I64X", val); result.concat(chunkBuf); printedAny = true; diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h b/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h index 9b6a10d8db..f0ef44aeae 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h @@ -309,19 +309,19 @@ class BitFlags for (int chunk = numChunks - 1; chunk >= 0; --chunk) { - unsigned long long val = 0; + UnsignedInt64 val = 0; for (int bit = 0; bit < 64 && (chunk * 64 + bit) < NUMBITS; ++bit) { if (m_bits.test(chunk * 64 + bit)) - val |= (unsigned long long)(1) << bit; + val |= (UnsignedInt64)(1) << bit; } if (val != 0 || chunk == 0 || printedAny) { if (printedAny) - snprintf(chunkBuf, sizeof(chunkBuf), "%016llX", val); + snprintf(chunkBuf, sizeof(chunkBuf), "%016I64X", val); else - snprintf(chunkBuf, sizeof(chunkBuf), "%llX", val); + snprintf(chunkBuf, sizeof(chunkBuf), "%I64X", val); result.concat(chunkBuf); printedAny = true;