BUG: Restore compatibility with ISO C

Fixes msvc compile errors