Log Message:
Fixed the patches to _never_ use the varargs macros. This fixes the
build on Mac OS X, where the inconsistent preprocessor conditions made
the compilation fail.