more ANSI C changes