# 
# patch "ChangeLog"
#  from [952a656f60119f3deff5c3e914fba5e0c84957be]
#    to [7e3d49d69da79277031b292e6b43103670e68db2]
# 
# patch "paths.cc"
#  from [6ddb5b2c0dee37d6942a502dd961b1ecad087278]
#    to [c5f47c57fb2b3b2c21725816bc2ca55b6b62a32e]
# 
========================================================================
--- ChangeLog	952a656f60119f3deff5c3e914fba5e0c84957be
+++ ChangeLog	7e3d49d69da79277031b292e6b43103670e68db2
@@ -1,5 +1,6 @@
 2005-09-09  Matthew Gregan  <address@hidden>
 
+	* paths.cc: Consistency--use WIN32 rather than _WIN32.
 	* file_io.cc (walk_tree): Correct test for file existence.
 
 2005-09-08  Matthew Gregan  <address@hidden>
========================================================================
--- paths.cc	6ddb5b2c0dee37d6942a502dd961b1ecad087278
+++ paths.cc	c5f47c57fb2b3b2c21725816bc2ca55b6b62a32e
@@ -335,7 +335,7 @@
     return false;
   if (path[0] == '/')
     return true;
-#ifdef _WIN32
+#ifdef WIN32
   if (path[0] == '\\')
     return true;
   if (path.size() > 1 && path[1] == ':')
@@ -675,7 +675,7 @@
                             "//blah",
                             "\\foo",
                             "c:\\foo",
-#ifdef _WIN32
+#ifdef WIN32
                             "c:foo",
                             "c:/foo",
 #endif
@@ -714,7 +714,7 @@
   check_fp_normalizes_to("../..", "");
   check_fp_normalizes_to("MT/foo", "a/b/MT/foo");
   check_fp_normalizes_to("MT", "a/b/MT");
-#ifndef _WIN32
+#ifndef WIN32
   check_fp_normalizes_to("c:foo", "a/b/c:foo");
   check_fp_normalizes_to("c:/foo", "a/b/c:/foo");
 #endif
@@ -841,7 +841,7 @@
   check_system_normalizes_to("foo/bar", "/a/b/foo/bar");
   check_system_normalizes_to("/foo/bar", "/foo/bar");
   check_system_normalizes_to("//foo/bar", "//foo/bar");
-#ifdef _WIN32
+#ifdef WIN32
   check_system_normalizes_to("c:foo", "c:foo");
   check_system_normalizes_to("c:/foo", "c:/foo");
   check_system_normalizes_to("c:\\foo", "c:\\foo");
@@ -872,7 +872,7 @@
   BOOST_CHECK(tilde_expanded[0] == '/');
   BOOST_CHECK(tilde_expanded.find('~') == std::string::npos);
   // and check for the weird WIN32 version
-#ifdef _WIN32
+#ifdef WIN32
   std::string tilde_expanded2 = system_path("~this_user_does_not_exist_anywhere").as_external();
   BOOST_CHECK(tilde_expanded2[0] = '/');
   BOOST_CHECK(tilde_expanded.find('~') == std::string::npos);