BUG: Restore compatibility with ISO C

Fixes msvc compile errors
Merge pull request #3496 from cgohlke/patch-1

BUG: Restore compatibility with ISO C