Merge pull request #1153 from robertovargas-arm/fix-macros

Avoid use of undefined macros