Avoid excessive warnings about redefined macros

Patch by Benny Baumann <BenBE@geshi.org>.

Originally submitted as Debian Bug 747666:
https://bugs.debian.org/747666
Merge pull request #453 from ryanakca/debian-bug-747666

Avoid excessive warnings about redefined macros