Avoid double-declarations of macros for parallel branch verification#813

marcoeilers merged 2 commits intomasterviperproject/silicon:masterfrom

meilers_macro_fix_againviperproject/silicon:meilers_macro_fix_againCopy head branch name to clipboard