jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing build issue introduced in filesystem check-in

Browse Source
This commit is contained in:
Arvid Norberg
2009-10-27 01:47:54 +00:00
parent e11f5265bd
commit 4ecbc21101
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/escape_string.cpp
View File

@@ -618,7 +618,7 @@ namespace libtorrent
ret.resize(outsize); ret.resize(outsize);
char const* in = &s[0]; char const* in = &s[0];
char* out = &ret[0]; char* out = &ret[0];
size_t retval = iconv(iconv_handle, (char**)&in, &insize, size_t retval = iconv(h, (char**)&in, &insize,
&out, &outsize); &out, &outsize);
if (retval == (size_t)-1) return s; if (retval == (size_t)-1) return s;
ret.resize(outsize); ret.resize(outsize);

6
src/file.cpp
View File

@@ -93,7 +93,7 @@ BOOST_STATIC_ASSERT(sizeof(lseek(0, 0, 0)) >= 8);
// for convert_to_wstring and convert_to_native // for convert_to_wstring and convert_to_native
#include "libtorrent/escape_string.hpp" #include "libtorrent/escape_string.hpp"
#include <stdio.h>
#include "libtorrent/assert.hpp" #include "libtorrent/assert.hpp"
#ifdef TORRENT_DEBUG #ifdef TORRENT_DEBUG
@@ -152,7 +152,7 @@ namespace libtorrent
#else #else
std::string f1 = convert_to_native(inf); std::string f1 = convert_to_native(inf);
std::string f2 = convert_to_native(newf); 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 #endif
{ {
ec.assign(errno, boost::system::get_generic_category()); ec.assign(errno, boost::system::get_generic_category());
@@ -457,7 +457,7 @@ namespace libtorrent
} }
#else // TORRENT_WINDOWS #else // TORRENT_WINDOWS
std::string f = convert_to_native(inf); 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()); ec.assign(errno, boost::system::get_generic_category());
return; return;