am 7d71d88c: Merge "Use _WIN32 rather than HAVE_WINDOWS_PATHS."

* commit '7d71d88c6d305d6ed19b320944f4ce644db82240':
  Use _WIN32 rather than HAVE_WINDOWS_PATHS.