Comment 2 for bug 858814

Thanks for your patch, and sorry it has taken so long to review!

I've made a couple of updates so that it applies cleanly to trunk and uses the __cplusplus macro to test C++ standard (the macro is part of the C++ standard rather than a GCC thing).

Committed in lp:inkscape r12166.