github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2009-02-07 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Fixed compile error when HAVE_EPOLL is not defined.
	Fixed linker error on bigendian systems.
	* src/SocketCore.cc
	* src/SocketCore.h
	* test/DefaultBtProgressInfoFileTest.cc
pull/1/head
Tatsuhiro Tsujikawa 2009-02-06 16:49:24 +00:00
parent 0640ea6254
commit 5f0f8e68b2
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2009-02-07 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Fixed compile error when HAVE_EPOLL is not defined.
Fixed linker error on bigendian systems.
* src/SocketCore.cc
* src/SocketCore.h
* test/DefaultBtProgressInfoFileTest.cc
2009-02-04 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-02-04 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Added --bt-external-ip option. You can specify the external IP Added --bt-external-ip option. You can specify the external IP

2
src/SocketCore.cc
View File

@ -1062,11 +1062,11 @@ void SocketCore::useEpoll()
{ {
_pollMethod = SocketCore::POLL_METHOD_EPOLL; _pollMethod = SocketCore::POLL_METHOD_EPOLL;
} }
#endif // HAVE_EPOLL
void SocketCore::useSelect() void SocketCore::useSelect()
{ {
_pollMethod = SocketCore::POLL_METHOD_SELECT; _pollMethod = SocketCore::POLL_METHOD_SELECT;
} }
#endif // HAVE_EPOLL
} // namespace aria2 } // namespace aria2

5
src/SocketCore.h
View File

@ -82,15 +82,14 @@ private:
struct epoll_event _epEvent; struct epoll_event _epEvent;
#endif // HAVE_EPOLL
enum PollMethod { enum PollMethod {
POLL_METHOD_EPOLL, POLL_METHOD_SELECT POLL_METHOD_EPOLL, POLL_METHOD_SELECT
}; };
static PollMethod _pollMethod; static PollMethod _pollMethod;
#endif // HAVE_EPOLL
bool blocking; bool blocking;
int secure; int secure;

8
test/DefaultBtProgressInfoFileTest.cc
View File

@ -26,11 +26,15 @@ class DefaultBtProgressInfoFileTest:public CppUnit::TestFixture {
#ifdef ENABLE_BITTORRENT #ifdef ENABLE_BITTORRENT
CPPUNIT_TEST(testSave); CPPUNIT_TEST(testSave);
CPPUNIT_TEST(testLoad); CPPUNIT_TEST(testLoad);
#ifndef WORDS_BIGENDIAN
CPPUNIT_TEST(testLoad_compat); CPPUNIT_TEST(testLoad_compat);
#endif // !WORDS_BIGENDIAN
#endif // ENABLE_BITTORRENT #endif // ENABLE_BITTORRENT
CPPUNIT_TEST(testSave_nonBt); CPPUNIT_TEST(testSave_nonBt);
CPPUNIT_TEST(testLoad_nonBt); CPPUNIT_TEST(testLoad_nonBt);
#ifndef WORDS_BIGENDIAN
CPPUNIT_TEST(testLoad_nonBt_compat); CPPUNIT_TEST(testLoad_nonBt_compat);
#endif // !WORDS_BIGENDIAN
CPPUNIT_TEST(testLoad_nonBt_pieceLengthShorter); CPPUNIT_TEST(testLoad_nonBt_pieceLengthShorter);
CPPUNIT_TEST(testUpdateFilename); CPPUNIT_TEST(testUpdateFilename);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
@ -74,11 +78,15 @@ public:
#ifdef ENABLE_BITTORRENT #ifdef ENABLE_BITTORRENT
void testSave(); void testSave();
void testLoad(); void testLoad();
#ifndef WORDS_BIGENDIAN
void testLoad_compat(); void testLoad_compat();
#endif // !WORDS_BIGENDIAN
#endif // ENABLE_BITTORRENT #endif // ENABLE_BITTORRENT
void testSave_nonBt(); void testSave_nonBt();
void testLoad_nonBt(); void testLoad_nonBt();
#ifndef WORDS_BIGENDIAN
void testLoad_nonBt_compat(); void testLoad_nonBt_compat();
#endif // !WORDS_BIGENDIAN
void testLoad_nonBt_pieceLengthShorter(); void testLoad_nonBt_pieceLengthShorter();
void testUpdateFilename(); void testUpdateFilename();
}; };