Some more changes to make code compile under a C++ compiler.
5 files changed