fix: Resolve macro redefinition warnings (TheSuperHackers#2525)

Skyaero42 · web-flow · commit 589f960aad1d · 2026-04-06T20:59:01.000+02:00
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/registry.cpp b/Core/Libraries/Source/WWVegas/WWDownload/registry.cpp
@@ -20,12 +20,9 @@
 // Simple interface for storing/retrieving registry values
 // Author: Matthew D. Campbell, December 2001
 
-#include <string>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #include "Registry.h"
+#include <string>
+#include "win.h"
 
 bool  getStringFromRegistry(HKEY root, std::string path, std::string key, std::string& val)
 {
diff --git a/Core/Libraries/Source/WWVegas/WWLib/thread.cpp b/Core/Libraries/Source/WWVegas/WWLib/thread.cpp
@@ -16,7 +16,6 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define _WIN32_WINNT 0x0400
 
 #include "thread.h"
 #include "Except.h"
diff --git a/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h b/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h
@@ -57,8 +57,6 @@ typedef struct
 } TGlobalTextureClass;
 
 
-#define NUM_ALPHA_TILES 8
-
 class WorldHeightMapEdit : public WorldHeightMap
 {
 protected:

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@ typedef struct`
`57`	`57`	`} TGlobalTextureClass;`
`58`	`58`
`59`	`59`
`60`		`-#define NUM_ALPHA_TILES 8`
`61`		`-`
`62`	`60`	`class WorldHeightMapEdit : public WorldHeightMap`
`63`	`61`	`{`
`64`	`62`	`protected:`