From 4ecbc211012e7625cc59764582f97f71a532f47c Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Tue, 27 Oct 2009 01:47:54 +0000
Subject: [PATCH] fixing build issue introduced in filesystem check-in

---
 src/escape_string.cpp | 2 +-
 src/file.cpp          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/escape_string.cpp b/src/escape_string.cpp
index 049cbea7a..a57ed97b6 100644
--- a/src/escape_string.cpp
+++ b/src/escape_string.cpp
@@ -618,7 +618,7 @@ namespace libtorrent
 		ret.resize(outsize);
 		char const* in = &s[0];
 		char* out = &ret[0];
-		size_t retval = iconv(iconv_handle, (char**)&in, &insize,
+		size_t retval = iconv(h, (char**)&in, &insize,
 			&out, &outsize);
 		if (retval == (size_t)-1) return s;
 		ret.resize(outsize);
diff --git a/src/file.cpp b/src/file.cpp
index b9e08cbf1..4bb388bd9 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -93,7 +93,7 @@ BOOST_STATIC_ASSERT(sizeof(lseek(0, 0, 0)) >= 8);
 
 // for convert_to_wstring and convert_to_native
 #include "libtorrent/escape_string.hpp"
-
+#include <stdio.h>
 #include "libtorrent/assert.hpp"
 
 #ifdef TORRENT_DEBUG
@@ -152,7 +152,7 @@ namespace libtorrent
 #else
 		std::string f1 = convert_to_native(inf);
 		std::string f2 = convert_to_native(newf);
-		if (std::rename(f1.c_str(), f2.c_str()) < 0)
+		if (::rename(f1.c_str(), f2.c_str()) < 0)
 #endif
 		{
 			ec.assign(errno, boost::system::get_generic_category());
@@ -457,7 +457,7 @@ namespace libtorrent
 		}
 #else // TORRENT_WINDOWS
 		std::string f = convert_to_native(inf);
-		if (std::remove(f.c_str()) < 0)
+		if (::remove(f.c_str()) < 0)
 		{
 			ec.assign(errno, boost::system::get_generic_category());
 			return;