Log Message:
Patch a couple of prototypes so that they more properly match the
actual function declarations.  This makes finicky c compilers happier.

Problem pointed out by Georg Schwarz in private email.