Fix redefinition and expression of macro

No match.