normalize the macros' "do {...} while (0)" constructs

(so we're no longer bitten by the extra ';' problem!)

Change-Id: Icf849c97df9a7af135ba15a7906fc28590d7ce77
1 file changed