[patch] gcc4 fixes

[Brian Dessent]

Christopher Faylor wrote:

> Go ahead and check these in but please use GNU formatting conventions,
> i.e., it's (char *) NULL, not (char *)NULL.  Actually, isn't just NULL
> sufficient?

I must have had C++ on the mind, thinking that the cast was necessary.

> Sorry but no.  This is a workaround.  We need to fix the actual problem.

Certainly.  I fully admit I have no real idea what the 'actual' problem
is yet.

Brian