fixing (some) clang++/C11 issues
Merge pull request #747 from dcoeurjo/FixingClang++Issues

fixing (some) clang++/C11 issues