# 
# patch "ChangeLog"
#  from [1c8b6c6688c73357a0d73b6c8ae562bca7b1002f]
#    to [127927f012cc17187bbf3a654a9cfe9b158507e7]
# 
# patch "unix/fs.cc"
#  from [d8d77413b5d049471371f97adb450b4d6a9e6780]
#    to [b07c7213446f62380f15f0b8985beb716cecd8f3]
# 
# patch "win32/fs.cc"
#  from [c9a82e276c7420d31f928c439dc545acd2a6b209]
#    to [38ce311dec5f6b399c799ff10cc3e8c8dae4429c]
# 
========================================================================
--- ChangeLog	1c8b6c6688c73357a0d73b6c8ae562bca7b1002f
+++ ChangeLog	127927f012cc17187bbf3a654a9cfe9b158507e7
@@ -1,5 +1,9 @@
 2005-08-25  Nathaniel Smith  <address@hidden>
 
+	* {unix,win32}/fs.cc: Misc. compile fixes.
+
+2005-08-25  Nathaniel Smith  <address@hidden>
+
 	* Makefile.am (UNIX_PLATFORM_SOURCES): Add unix/fs.cc
 	(WIN32_PLATFORM_SOURCES): Add win32/fs.cc
 	* paths.hh (bookkeeping_path): Implement default constructor.
========================================================================
--- unix/fs.cc	d8d77413b5d049471371f97adb450b4d6a9e6780
+++ unix/fs.cc	b07c7213446f62380f15f0b8985beb716cecd8f3
@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <pwd.h>
 
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
@@ -38,11 +39,11 @@
 {
   char * home = getenv("HOME");
   if (home != NULL)
-    return string(home);
+    return std::string(home);
 
   struct passwd * pw = getpwuid(getuid());  
   N(pw != NULL, F("could not find home directory for uid %d") % getuid());
-  return string(pw->pw_dir);
+  return std::string(pw->pw_dir);
 }
 
 utf8 tilde_expand(utf8 const & in)
@@ -54,7 +55,7 @@
       fs::path res;
       if (*i == "~")
         {
-          res /= mkpath(get_homedir());
+          res /= get_homedir()();
           ++i;
         }
       else if (i->size() > 1 && i->at(0) == '~')
@@ -74,7 +75,7 @@
       return res.string();
     }
 
-  return tmp;
+  return tmp.string();
 }
 
 path::status
========================================================================
--- win32/fs.cc	c9a82e276c7420d31f928c439dc545acd2a6b209
+++ win32/fs.cc	38ce311dec5f6b399c799ff10cc3e8c8dae4429c
@@ -82,14 +82,14 @@
 utf8
 tilde_expand(utf8 const & path)
 {
-  fs::path tmp(path, fs::native);
+  fs::path tmp(path(), fs::native);
   fs::path::iterator i = tmp.begin();
   if (i != tmp.end())
     {
       fs::path res;
       if (*i == "~" || i->size() > 1 && i->at(0) == '~')
         {
-          res /= mkpath(get_homedir());
+          res /= get_homedir()();
           ++i;
         }
       while (i != tmp.end())