Fix Issue 10058.
Merge pull request #2007 from ibuclaw/cppmangle

Fix Issue 10058 - Inconsistent mangling between C++ and extern(C++).