Correct inconsistent macros that can break build on x86