Build fixes for gcc 4.0 with -Werror, from Tito.
6 files changed