merge r1225791 from trunk: Fix another case of #ifdef-within-a-macro (which was inadvertently introduced a few days ago).