(7z) Prevent redefinitions of macros for Griffin builds