Updates to make the Compaq compiler happy.
Authored by: debug 2007-05-20
Parent: [r4848]
Child: [r4850]
