fixed ISO C90 issues