Skip to content

fix: Resolve macro redefinition warnings #2525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 6 commits into from
Apr 6, 2026
+2 −8
Merged

fix: Resolve macro redefinition warnings #2525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ce9cec
fix: Add preprocessor guards around macros to resolve redefinition wa…
Skyaero42 Apr 2, 2026
8f72c5b
fix: removing defines alltogether
Skyaero42 Apr 3, 2026
2055397
fix: replace macro definition WIN32_LEAN_AND_MEAN by header inclusion
Skyaero42 Apr 4, 2026
275992f
fix: removing windows.h as it is included in win.h
Skyaero42 Apr 5, 2026
f1e08da
refactor: sort includes
Skyaero42 Apr 6, 2026
27d6f68
fix: use correct header encapsulation
Skyaero42 Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Core/Libraries/Source/WWVegas/WWDownload/registry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
1 change: 0 additions & 1 deletion Core/Libraries/Source/WWVegas/WWLib/thread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ typedef struct
} TGlobalTextureClass;


#define NUM_ALPHA_TILES 8

class WorldHeightMapEdit : public WorldHeightMap
{
protected:
Expand Down
Loading