merged attempted build fix from RC_0_16
This commit is contained in:
parent
e357440fd9
commit
70d3170963
|
@ -63,7 +63,10 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include <cstdlib>
|
#include <stdlib.h>
|
||||||
|
#include <string>
|
||||||
|
#include <exception>
|
||||||
|
#include <iterator> // for distance
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning(push, 1)
|
#pragma warning(push, 1)
|
||||||
|
@ -248,11 +251,7 @@ namespace libtorrent
|
||||||
++in; // 'e'
|
++in; // 'e'
|
||||||
ret = entry(entry::int_t);
|
ret = entry(entry::int_t);
|
||||||
char* end_pointer;
|
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);
|
ret.integer() = strtoll(val.c_str(), &end_pointer, 10);
|
||||||
#endif
|
|
||||||
#ifdef TORRENT_DEBUG
|
#ifdef TORRENT_DEBUG
|
||||||
ret.m_type_queried = false;
|
ret.m_type_queried = false;
|
||||||
#endif
|
#endif
|
||||||
|
@ -354,7 +353,7 @@ namespace libtorrent
|
||||||
}
|
}
|
||||||
TORRENT_ASSERT(*in == ':');
|
TORRENT_ASSERT(*in == ':');
|
||||||
++in; // ':'
|
++in; // ':'
|
||||||
int len = std::atoi(len_s.c_str());
|
int len = atoi(len_s.c_str());
|
||||||
ret = entry(entry::string_t);
|
ret = entry(entry::string_t);
|
||||||
read_string(in, end, len, ret.string(), err);
|
read_string(in, end, len, ret.string(), err);
|
||||||
if (err)
|
if (err)
|
||||||
|
|
|
@ -59,7 +59,6 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <winioctl.h>
|
#include <winioctl.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
|
||||||
#else
|
#else
|
||||||
// posix part
|
// posix part
|
||||||
#define _FILE_OFFSET_BITS 64
|
#define _FILE_OFFSET_BITS 64
|
||||||
|
@ -75,7 +74,6 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/uio.h>
|
#include <sys/uio.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <dirent.h> // for DIR
|
#include <dirent.h> // for DIR
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,6 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning(push, 1)
|
#pragma warning(push, 1)
|
||||||
|
|
Loading…
Reference in New Issue