"Fix" linking C and C++ code together

This isn't the best fix, but it at least works.  I think I need to add
some sort of generic framework for handling multiple-language linkage
instead of this "link-name" stuff, that's not really cutting it.