1511140 - MachIPC.h: Fails with [-Werror,-Wmacro-redefined]

Status: RESOLVED FIXED

(Toolkit :: Crash Reporting, defect)

Description

[Sylvestre Ledru [:Sylvestre]]

https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=214661522&repo=try&lineNumber=32352
[task 2018-11-29T19:20:14.132Z] 19:20:14     INFO -  In file included from /builds/worker/workspace/build/src/toolkit/crashreporter/breakpad-client/mac/handler/exception_handler.h:48:
[task 2018-11-29T19:20:14.133Z] 19:20:14     INFO -  In file included from /builds/worker/workspace/build/src/toolkit/crashreporter/breakpad-client/mac/crash_generation/crash_generation_client.h:33:
[task 2018-11-29T19:20:14.133Z] 19:20:14    ERROR -  /builds/worker/workspace/build/src/toolkit/crashreporter/google-breakpad/src/common/mac/MachIPC.h:98:9: error: 'PRINT_MACH_RESULT' macro redefined [-Werror,-Wmacro-redefined]
[task 2018-11-29T19:20:14.133Z] 19:20:14     INFO -  #define PRINT_MACH_RESULT(result_, message_) \
[task 2018-11-29T19:20:14.133Z] 19:20:14     INFO -          ^
[task 2018-11-29T19:20:14.133Z] 19:20:14     INFO -  /builds/worker/workspace/build/src/ipc/chromium/src/chrome/common/mach_ipc_mac.h:70:9: note: previous definition is here
[task 2018-11-29T19:20:14.133Z] 19:20:14     INFO -  #define PRINT_MACH_RESULT(result_, message_) \
[task 2018-11-29T19:20:14.133Z] 19:20:14     INFO -          ^
[task 2018-11-29T19:20:14.133Z] 19:20:14     INFO -  1 error generated.

Comment 1

[Sylvestre Ledru [:Sylvestre]]

Attachment: Bug 1511140 - Declare PRINT_MACH_RESULT only once r?ehsan

Comment 2

[Sylvestre Ledru [:Sylvestre]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=981f0506e4c61635d8e851f110719e93ca0fceb8

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/982d3f5bc88b
Declare PRINT_MACH_RESULT only once r=Ehsan

Comment 4

[Noemi Erli[:noemi_erli]]

https://hg.mozilla.org/mozilla-central/rev/982d3f5bc88b

Comment 5

[(no longer active)]

Comment on attachment 9028745 [details]
Bug 1511140 - Declare PRINT_MACH_RESULT only once r?ehsan

[ESR Uplift Approval Request]

If this is not a sec:{high,crit} bug, please state case for ESR consideration: This is required for easier backporting of patches after the reformatting of ESR using clang-format.

User impact if declined: Declining this will negatively impact our developers' ability to easily backport their patches to ESR in the future.

Fix Landed on Version: 65

Risk to taking this patch: Low

Why is the change risky/not risky? (and alternatives if risky): This is a trivial change that doesn't impact the generated binary code we ship.

String or UUID changes made by this patch: None

Comment 6

[Liz Henry (:lizzard) (relman/hg->git project)]

Comment on attachment 9028745 [details]
Bug 1511140 - Declare PRINT_MACH_RESULT only once r?ehsan

OK for uplift to ESR60 as part of the clang-format project.

Comment 7

[(no longer active)]

https://hg.mozilla.org/releases/mozilla-esr60/rev/914b2e8e71e1