* qatar/master: atomics: cosmetics: Restructure ifdefs for greater clarity Merged-by: Michael Niedermayer <michaelni@gmx.at>