Trace macros adjusted to be more gcc-friendly
Authored by: sgrottel 2013-09-04
Parent: [r341]
Child: [r343]
