> Sure, I did it this way so I could avoid changing of the header file and rebuilding > of the whole source. The patch is definitely not meant to be applied as is.
I've applied it as-is because properly running code always trumps theory and discussion. If you'd like to clean it up anyway, of course go ahead.