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

* commit 'a7e6be686d38e80cbb385f643eb5c790a7094f34':
  Use _WIN32 rather than HAVE_WINDOWS_PATHS.