fix: Resolve macro redefinition warnings

[Skyaero42]

• Related to Fix Compiler Warnings - Generals + Tools - Level 1 warnings #499
• Related to Fix Compiler Warnings - Zero Hour + Tools - Level 1 warnings #503

NUM_ALPHA_TILES in Generals\Wheightmapedit.h was unused and is removed
_WIN32_WINNT was unused and is removed
WIN32_LEAN_AND_MEAN was redefined in registry.cpp. Included win.h instead, which already handles this macro correctly.

[greptile-apps]

Greptile Summary

This PR removes three macro redefinition warnings by cleaning up stale or conflicting #define directives. In registry.cpp, the locally-defined WIN32_LEAN_AND_MEAN is replaced with an include of win.h (which guards the macro with #ifndef before defining it), since core_wwcommon already injects WIN32_LEAN_AND_MEAN as a compile definition project-wide. In thread.cpp, the ancient _WIN32_WINNT 0x0400 (Windows NT 4.0) define is dropped — it wasn't needed by any API call in the file and is not defined anywhere else in the project. In WHeightMapEdit.h, NUM_ALPHA_TILES 8 is removed because the included WorldHeightMap.h already defines it as 12, and no WorldBuilder source file uses the macro at all.

Confidence Score: 5/5

This PR is safe to merge; all changes are correct removals of redundant or conflicting preprocessor definitions.

All three changes are verified: WIN32_LEAN_AND_MEAN is already defined by core_wwcommon, _WIN32_WINNT 0x0400 is unused and the removed APIs remain available on any Windows target, and NUM_ALPHA_TILES is unused by WorldBuilder source files. No functional behavior changes.

No files require special attention.

Important Files Changed

Filename	Overview
Core/Libraries/Source/WWVegas/WWDownload/registry.cpp	Removes redundant WIN32_LEAN_AND_MEAN define and replaces direct <windows.h> include with win.h, which guards the macro properly via #ifndef
Core/Libraries/Source/WWVegas/WWLib/thread.cpp	Removes stale _WIN32_WINNT 0x0400 define targeting Windows NT 4.0; the value is unused and redundant with modern SDK defaults
Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h	Removes NUM_ALPHA_TILES 8 macro that conflicted with WorldHeightMap.h's definition of 12; the macro has zero uses in WorldBuilder source files

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    A[registry.cpp] -->|#include| B[Registry.h]
    A -->|#include| C[win.h]
    C --> D{#ifndef WIN32_LEAN_AND_MEAN}
    D -->|not defined| E[#define WIN32_LEAN_AND_MEAN]
    D -->|already defined| F[skip define]
    E --> G[#include windows.h]
    F --> G
    H[core_wwcommon CMake] -->|compile definition| I[WIN32_LEAN_AND_MEAN pre-defined]
    I -.->|causes F path| D
    style A fill:#d4edda
    style C fill:#d4edda
    style H fill:#cce5ff

Loading

_{Reviews (6): Last reviewed commit: "fix: use correct header encapsulation" | Re-trigger Greptile}

[bobtista]

Could we use add_compile_definitions(WIN32_LEAN_AND_MEAN) in cmake and clean up all the individual defines?

[xezon]

The Pull title needs some polishing.

[Skyaero42]

The Pull title needs some polishing.

done

[xezon]

"win.h"

Sort alphabetically.

[Skyaero42]

Was wondering already whether that would be in scope or not. Its done now

[xezon]

It still uses <> instead of "", which is unusual.