Make new gcc -Wall happy
4 files changed