From 9005fdf09be1e98a8d9ba461c66b262dc22ddcf7 Mon Sep 17 00:00:00 2001
From: xezon <4720891+xezon@users.noreply.github.com>
Date: Sat, 31 May 2025 10:32:57 +0200
Subject: [PATCH] [GEN][ZH] Refactor use of RETAIL_COMPATIBLE_CRC macro

---
 Generals/Code/GameEngine/Include/Common/crc.h           | 4 ++--
 Generals/Code/GameEngine/Source/Common/GlobalData.cpp   | 2 +-
 GeneralsMD/Code/GameEngine/Include/Common/crc.h         | 4 ++--
 GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Generals/Code/GameEngine/Include/Common/crc.h b/Generals/Code/GameEngine/Include/Common/crc.h
index ca2752ca7ee..5b05c92f2ad 100644
--- a/Generals/Code/GameEngine/Include/Common/crc.h
+++ b/Generals/Code/GameEngine/Include/Common/crc.h
@@ -47,7 +47,7 @@ class CRC
 //	UnsignedInt get( void ) { return htonl(crc); }	///< Get the combined CRC
 	UnsignedInt get( void );
 
-#if (defined(_MSC_VER) && _MSC_VER < 1300) && defined(RETAIL_COMPATIBLE_CRC)
+#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
   void set( UnsignedInt v )
   {
     crc = v;
@@ -127,7 +127,7 @@ class CRC
     return crc;
   }
 
-#if (defined(_MSC_VER) && _MSC_VER < 1300) && defined(RETAIL_COMPATIBLE_CRC)
+#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
   void set( UnsignedInt v )
   {
     crc = v;
diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp
index 166f9d0f5d3..b3c407c02da 100644
--- a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp
+++ b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp
@@ -990,7 +990,7 @@ GlobalData::GlobalData()
 	File *fp;
 	// TheSuperHackers @tweak SkyAero/xezon 27/05/2025
 	// Simulate the EXE's CRC value to force Network and Replay compatibility with another build.
-#if (defined(_MSC_VER) && _MSC_VER < 1300) && defined(RETAIL_COMPATIBLE_CRC)
+#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
 
 #define GENERALS_108_CD_EXE_CRC    0x93d1eab4
 #define GENERALS_108_STEAM_EXE_CRC 0x8d6e4dd7
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/crc.h b/GeneralsMD/Code/GameEngine/Include/Common/crc.h
index 44194ae4421..ea100421178 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/crc.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/crc.h
@@ -47,7 +47,7 @@ class CRC
 //	UnsignedInt get( void ) { return htonl(crc); }	///< Get the combined CRC
 	UnsignedInt get( void );
 
-#if (defined(_MSC_VER) && _MSC_VER < 1300) && defined(RETAIL_COMPATIBLE_CRC)
+#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
   void set( UnsignedInt v )
   {
     crc = v;
@@ -127,7 +127,7 @@ class CRC
     return crc;
   }
 
-#if (defined(_MSC_VER) && _MSC_VER < 1300) && defined(RETAIL_COMPATIBLE_CRC)
+#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
   void set( UnsignedInt v )
   {
     crc = v;
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
index fef73bc4070..83e33c3b61a 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
@@ -999,7 +999,7 @@ GlobalData::GlobalData()
 	File *fp;
 	// TheSuperHackers @tweak SkyAero/xezon 27/05/2025
 	// Simulate the EXE's CRC value to force Network and Replay compatibility with another build.
-#if (defined(_MSC_VER) && _MSC_VER < 1300) && defined(RETAIL_COMPATIBLE_CRC)
+#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
 
 #define GENERALSMD_104_CD_EXE_CRC    0x4f6c5afe
 #define GENERALSMD_104_STEAM_EXE_CRC 0xcb430f5f