Merge r1225476: Don't use #ifdef inside macro calls The behavior is undefined according to C99 6.10.3.11 and it breaks with xlc on AIX PR: 52394