1776461 - Various Windows mozilla-config.h: macro redefined warnings

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Ryan VanderMeulen [:RyanVM]]

Not sure if it's tied to my specific Window SDK or not.

objdir-clang/dist/include\mozilla-config.h(149,9): warning: 'WIN32' macro redefined [-Wmacro-redefined]
#define WIN32 1
        ^
C:/PROGRA~2/WI3CF2~1/10/include/10.0.22000.0/shared\minwindef.h(38,9): note: previous definition is here
#define WIN32
        ^
In file included from xul.dll.rc:20:
objdir-clang/dist/include\mozilla-config.h(157,9): warning: '_WIN32_IE' macro redefined [-Wmacro-redefined]
#define _WIN32_IE 0x0800
        ^
C:/PROGRA~2/WI3CF2~1/10/include/10.0.22000.0/shared\sdkddkver.h(268,9): note: previous definition is here
#define _WIN32_IE       0x0A00
        ^

We already have logic in process_define_files.py to avoid redefining the WINVER & _WIN32_WINNT macros. Let's just add these 2 as well.

Comment 1

[Ryan VanderMeulen [:RyanVM]]

Attachment: Bug 1776461 - Don't define the WIN32 and _WIN32_IE macros in mozilla-config.h if they're already defined.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/8362b5d22558
Don't define the WIN32 and _WIN32_IE macros in mozilla-config.h if they're already defined. r=firefox-build-system-reviewers,ahochheiden

Comment 3

[Marian-Vasile Laza]

https://hg.mozilla.org/mozilla-central/rev/8362b5d22558