replaced macros using __VA_ARGS__ in http://hg.mozilla.org/mozilla-central/rev/e4f8969d1142