From 70d31709637ab8cbd7451e336dfdcc12f56784ce Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Thu, 16 Aug 2012 00:48:13 +0000
Subject: [PATCH] merged attempted build fix from RC_0_16

---
 include/libtorrent/bencode.hpp | 11 +++++------
 include/libtorrent/file.hpp    |  2 --
 include/libtorrent/storage.hpp |  1 -
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/include/libtorrent/bencode.hpp b/include/libtorrent/bencode.hpp
index f5bc2d92e..e01325f4f 100644
--- a/include/libtorrent/bencode.hpp
+++ b/include/libtorrent/bencode.hpp
@@ -63,7 +63,10 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 
-#include <cstdlib>
+#include <stdlib.h>
+#include <string>
+#include <exception>
+#include <iterator> // for distance
 
 #ifdef _MSC_VER
 #pragma warning(push, 1)
@@ -248,11 +251,7 @@ namespace libtorrent
 				++in; // 'e' 
 				ret = entry(entry::int_t);
 				char* end_pointer;
-#if defined TORRENT_WINDOWS && !defined TORRENT_MINGW
-				ret.integer() = _strtoi64(val.c_str(), &end_pointer, 10);
-#else
 				ret.integer() = strtoll(val.c_str(), &end_pointer, 10);
-#endif
 #ifdef TORRENT_DEBUG
 				ret.m_type_queried = false;
 #endif
@@ -354,7 +353,7 @@ namespace libtorrent
 					}
 					TORRENT_ASSERT(*in == ':');
 					++in; // ':'
-					int len = std::atoi(len_s.c_str());
+					int len = atoi(len_s.c_str());
 					ret = entry(entry::string_t);
 					read_string(in, end, len, ret.string(), err);
 					if (err)
diff --git a/include/libtorrent/file.hpp b/include/libtorrent/file.hpp
index 0f55e4556..fb1e95fc3 100644
--- a/include/libtorrent/file.hpp
+++ b/include/libtorrent/file.hpp
@@ -59,7 +59,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <windows.h>
 #include <winioctl.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #else
 // posix part
 #define _FILE_OFFSET_BITS 64
@@ -75,7 +74,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <unistd.h>
 #include <sys/uio.h>
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <dirent.h> // for DIR
 
diff --git a/include/libtorrent/storage.hpp b/include/libtorrent/storage.hpp
index 5e3273af0..aa5983b90 100644
--- a/include/libtorrent/storage.hpp
+++ b/include/libtorrent/storage.hpp
@@ -35,7 +35,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include <vector>
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #ifdef _MSC_VER
 #pragma warning(push, 1)