2008-06-16 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Applied Ross's aria2-0.13.2+1-mingw-5.patch, which changes the 
type of
	socket from int to sock_t as sockets are unsigned in Windows.
	For AsyncNameResolver, DownloadEngine, I did additional 
modification
	for the portion of the code changed according to epoll support.
	I defined sock_t in a2netcompat.h to use sock_t without 
including
	SocketCore.h.
	* src/AsyncNameResolver.cc
	* src/AsyncNameResolver.h
	* src/DownloadEngine.cc
	* src/DownloadEngine.h
	* src/SocketCore.cc
	* src/SocketCore.h
	* src/a2netcompat.h

1 files changed, 8 insertions, 8 deletions

diff --git a/src/DownloadEngine.h b/src/DownloadEngine.h
index 251d5b69..b020974c 100644
--- a/src/DownloadEngine.h
+++ b/src/DownloadEngine.h
@@ -89,11 +89,11 @@ class ADNSEvent {
 private:
   SharedHandle<AsyncNameResolver> _resolver;
   Command* _command;
-  int _socket;
+  sock_t _socket;
   int _events;
 public:
   ADNSEvent(const SharedHandle<AsyncNameResolver>& resolver, Command* command,
-	    int socket, int events);
+	    sock_t socket, int events);
 
   void processEvents(int events);
 
@@ -106,7 +106,7 @@ public:
 
 class SocketEntry {
 private:
-  int _socket;
+  sock_t _socket;
 
   std::deque<CommandEvent> _commandEvents;
 
@@ -144,7 +144,7 @@ public:
 
 #endif // !HAVE_EPOLL
 
-  SocketEntry(int socket);
+  SocketEntry(sock_t socket);
 
   bool operator==(const SocketEntry& entry) const;
 
@@ -174,7 +174,7 @@ public:
 
 #endif // !HAVE_EPOLL
 
-  int getSocket() const;
+  sock_t getSocket() const;
 
   bool eventEmpty() const;
 
@@ -197,7 +197,7 @@ private:
 
   size_t _socketsSize;
   
-  int _sockets[ARES_GETSOCK_MAXNUM];
+  sock_t _sockets[ARES_GETSOCK_MAXNUM];
 
 #endif // HAVE_EPOLL
 
@@ -321,14 +321,14 @@ public:
   bool deleteSocketForWriteCheck(const SharedHandle<SocketCore>& socket,
 				 Command* command);
 
-  bool addSocketEvents(int socket, Command* command, int events
+  bool addSocketEvents(sock_t socket, Command* command, int events
 #if defined HAVE_EPOLL && defined ENABLE_ASYNC_DNS
 		       ,const SharedHandle<AsyncNameResolver>& rs =
 		       SharedHandle<AsyncNameResolver>()
 #endif // HAVE_EPOLL && ENABLE_ASYNC_DNS
 		       );
 
-  bool deleteSocketEvents(int socket, Command* command, int events
+  bool deleteSocketEvents(sock_t socket, Command* command, int events
 #if defined HAVE_EPOLL && defined ENABLE_ASYNC_DNS
 			  ,const SharedHandle<AsyncNameResolver>& rs =
 			  SharedHandle<AsyncNameResolver>()