# 
# patch "ChangeLog"
#  from [78ac18407ca101a18ae1c849237449cbb40708c3]
#    to [947a599e5ac635d100ca69cb364d171ba3535d6d]
# 
# patch "paths.hh"
#  from [97c11df05bcd28e529c7e22c01cdaa6a5dad3fc6]
#    to [cffb7a0bdb072d46c4b7ff07a5d26244e706dd4a]
# 
# patch "sanity.hh"
#  from [5f640e7a5b4d5c0a699399042d7884697050ae2d]
#    to [acd75604c16436b4df33ab2fb88481ea26579046]
# 
========================================================================
--- ChangeLog	78ac18407ca101a18ae1c849237449cbb40708c3
+++ ChangeLog	947a599e5ac635d100ca69cb364d171ba3535d6d
@@ -1,5 +1,9 @@
 2005-08-24  Nathaniel Smith  <address@hidden>
-	
+
+	* paths.hh, sanity.hh: Compilation fixes.
+
+2005-08-24  Nathaniel Smith  <address@hidden>
+
 	* paths.cc: Update tests to use path_state_* and pass utf8
 	objects.
 	
========================================================================
--- paths.hh	97c11df05bcd28e529c7e22c01cdaa6a5dad3fc6
+++ paths.hh	cffb7a0bdb072d46c4b7ff07a5d26244e706dd4a
@@ -8,7 +8,7 @@
 
 // safe, portable, fast, simple file handling -- in that order
 
-#include <ios_fwd>
+#include <iosfwd>
 #include <string>
 #include <vector>
 
@@ -38,11 +38,10 @@
   { return data; }
 protected:
   utf8 data;
-private:
   any_path();
   any_path(any_path const & other);
   any_path & operator=(any_path const & other);
-}
+};
 
 std::ostream & operator<<(std::ostream & o, any_path const & a);
 
@@ -60,9 +59,6 @@
   bool operator ==(const file_path & other) const
   { return data == other.data; }
 
-  bool operator !=(const file_path & other) const
-  { return data != other.data; }
-
   bool operator <(const file_path & other) const
   { return data < other.data; }
 
@@ -79,10 +75,8 @@
   //   -- are confirmed to be normalized and relative
   //   -- not to be in MT/
   file_path(source_type type, std::string const & path);
-  file_path(source_type type, utf8 const & path);
   friend file_path file_path_internal(std::string const & path);
-  friend file_path file_path_external(std::string const & path);
-  
+  friend file_path file_path_external(utf8 const & path);
 };
 
 // these are the public file_path constructors
========================================================================
--- sanity.hh	5f640e7a5b4d5c0a699399042d7884697050ae2d
+++ sanity.hh	acd75604c16436b4df33ab2fb88481ea26579046
@@ -20,6 +20,8 @@
 
 #include "quick_alloc.hh" // to get the QA() macro
 
+#include "paths.hh"
+
 #ifdef __GNUC__
 #define NORETURN __attribute__((noreturn))
 #else