Minor fixes to make the source code build with a 20080321 snapshot of GCC 4.4.
Authored by: gavare 2019-06-06
Parent: [r41]
Child: [r43]