merged build fixes from RC_0_16

This commit is contained in:
Arvid Norberg
2013-01-07 04:13:45 +00:00
parent 3788ed23ca
commit 1be837c6e4
2 changed files with 4 additions and 4 deletions

View File

@@ -1216,7 +1216,7 @@ namespace libtorrent
return -1; return -1;
} }
#else #else
if (m_file_handle == -1) if (m_fd == -1)
{ {
ec = error_code(EBADF, get_system_category()); ec = error_code(EBADF, get_system_category());
return -1; return -1;
@@ -1440,7 +1440,7 @@ namespace libtorrent
return -1; return -1;
} }
#else #else
if (m_file_handle == -1) if (m_fd == -1)
{ {
ec = error_code(EBADF, get_system_category()); ec = error_code(EBADF, get_system_category());
return -1; return -1;

View File

@@ -60,7 +60,7 @@ void test_checking(bool read_only_files, bool corrupt_files = false)
#ifdef TORRENT_WINDOWS #ifdef TORRENT_WINDOWS
SetFileAttributesA(path.c_str(), FILE_ATTRIBUTE_NORMAL); SetFileAttributesA(path.c_str(), FILE_ATTRIBUTE_NORMAL);
#else #else
chmod(path.c_str(), S_IRUSR | SUWUSR); chmod(path.c_str(), S_IRUSR | S_IWUSR);
#endif #endif
} }
@@ -180,7 +180,7 @@ void test_checking(bool read_only_files, bool corrupt_files = false)
#ifdef TORRENT_WINDOWS #ifdef TORRENT_WINDOWS
SetFileAttributesA(path.c_str(), FILE_ATTRIBUTE_NORMAL); SetFileAttributesA(path.c_str(), FILE_ATTRIBUTE_NORMAL);
#else #else
chmod(path.c_str(), S_IRUSR | SUWUSR); chmod(path.c_str(), S_IRUSR | S_IWUSR);
#endif #endif
} }
} }