killed off the last ANSI C warnings (redundant defines)