Attempting to reduce compiler warnings for gcc-4.2 (which I don't
have, but Darren Dale has reported some new warnings).
Authored by: mdboom 2007-08-02
Parent: [r3667]
Child: [r3669]
