More updates to make the code build without warnings on NetBSD/pmax 5.0.
Authored by: debug 2009-07-11
Parent: [r5482]
Child: [r5484]
