--- a/build/moz.configure/warnings.configure
+++ b/build/moz.configure/warnings.configure
@@ -94,16 +94,19 @@ check_and_add_gcc_warning('-Wno-error=de
 check_and_add_gcc_warning('-Wno-error=array-bounds')
 
 # can't get rid of those PGO warnings
 check_and_add_gcc_warning('-Wno-error=coverage-mismatch', when='MOZ_PGO')
 
 # false positives depending on optimizations
 check_and_add_gcc_warning('-Wno-error=free-nonheap-object')
 
+# Would be a pain to fix that in all occurrences for a small gain
+check_and_add_gcc_warning('-Wno-error=multistatement-macros')
+
 # catches format/argument mismatches with printf
 c_format_warning, cxx_format_warning = check_and_add_gcc_warning(
     '-Wformat', when=depends(target)(lambda t: t.kernel != 'WINNT'))
 
 # Add compile-time warnings for unprotected functions and format functions
 # that represent possible security problems. Enable this only when -Wformat
 # is enabled, otherwise it is an error
 check_and_add_gcc_warning('-Wformat-security',