Log Message:
Adjust one of Joerg's clang patches so it still works on gcc.

This would be much easier if clang didn't lie about itself being gcc.