premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

reverted ino_t cast and added fix only for android

This commit is contained in:
Alden Torres 2017-08-04 13:48:42 -04:00 committed by Arvid Norberg
parent 6b1037eff5
commit cb114a80e1
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/libtorrent/file.hpp
View File

@ -109,7 +109,15 @@ namespace libtorrent {
WIN32_FIND_DATAW m_fd;
#else
DIR* m_handle;
#ifdef TORRENT_ANDROID
// this is due to a documented bug in android related to a wrong type
// of ino_t, for general discussion and internal changes see:
// https://issuetracker.google.com/issues/37011207 - for general discussion
// https://android-review.googlesource.com/#/c/platform/system/core/+/123482/
std::uint64_t m_inode;
#else
ino_t m_inode;
#endif // TORRENT_ANDROID
std::string m_name;
#endif
bool m_done;

2
src/file.cpp
View File

@ -416,7 +416,7 @@ static_assert(!(open_mode::sparse & open_mode::attribute_mask), "internal flags
errno = 0;
if ((de = ::readdir(m_handle)) != nullptr)
{
m_inode = static_cast<ino_t>(de->d_ino);
m_inode = de->d_ino;
m_name = de->d_name;
}
else