make sure the preprocessor macro is defined correctly.
Merge branch 'master' into arc