Fix syntax error when preprocessor macros are defined inside of enum lists

Fixes SF Bug 428, Patch 333