Bring the windows config file in line with the simplifications

of the main httpd.conf.

Make a vain attempt to modify Makefile.win appropriately.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160989 13f79535-47bb-0310-9956-ffa450edef68