The fix done b2cd93fc does not really work since macro strification does not expand the sizeof nor the arithmetic operation. Checked on x86_64-linux-gnu. (cherry picked from commit c353689e)