Rename macro to a better name and sync with trunk.

Reviewed by wrowe, rjung.


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