With C99 we can now declare iterators inside the 'for' statements,
allowing a better syntax for this macro.
This new syntax accepts #if/#endif inside the loop body,
and makes explicit, at loop body level, what the iterator name is.

Change-Id: Icbd363a34a9264ff566ee8057c08a705736b509f