d9199d66b6
bullet-proof. also, make the arm32 #ifdefs a bit more consistent with the i386 #ifdefs (without actually changing the behaviour of the code).