Переглянути джерело

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
Tatsuhiro Tsujikawa 16 роки тому
батько
коміт
5f0f8e68b2
4 змінених файлів з 19 додано та 4 видалено
  1. 8 0
      ChangeLog
  2. 1 1
      src/SocketCore.cc
  3. 2 3
      src/SocketCore.h
  4. 8 0
      test/DefaultBtProgressInfoFileTest.cc

+ 8 - 0
ChangeLog

@@ -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>
 
 	Added --bt-external-ip option. You can specify the external IP

+ 1 - 1
src/SocketCore.cc

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

+ 2 - 3
src/SocketCore.h

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

+ 8 - 0
test/DefaultBtProgressInfoFileTest.cc

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