Trivial cleanup: Consistently use the CPP_MANGLE macro.
Merge pull request #1432 from klickverbot/use-cpp-mangle

Trivial cleanup: Consistently use the CPP_MANGLE macro.