fix FTBFS from prior merge commit. GCC doesn't like ifdef && it seems

dunno why. gcc 4.8 at least has troubles with it, while clang 3.2 does not