Add more missing 'do { ... } while (0)' in missing macros. Without it,

Add more missing 'do { ... } while (0)' in missing macros.  Without it,
these macros fail in if/else cases:

#define X \
{ \
	... \
}


{

	if (...)
		X;
	else
		...
}

with proper setup:

#define X \
do { \
	... \
} while (0)

it works fine.