merge r1225791 from trunk:

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1225792 13f79535-47bb-0310-9956-ffa450edef68