Do a "proper" indent by moving some curly braces outside of #if's.

Fix an error message to print the correct filename (not tempfile).
Remove the tempfile for Win32 on a failed rename(2).
PR:
Obtained from:
Submitted by:
Reviewed by:


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