Remove C99 style code so -std=c89 of clang works

Patch to make clang scan-build run through as mentioned in issue #891.