2007-08-01 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Make a2netcompat.h include a2io.h to fix compilation error:
	* src/a2netcompat.h
	* src/SocketCore.cc: Removed include of a2io.h
	* src/Util.cc: Removed include of a2io.h
	
	Gather time related functions to a2time.h:
	* src/a2time.h: New file.
	* src/DefaultPeerStorage.cc
	* src/SimpleLogger.cc
	* src/Util.{h, cc}
	* src/SimpleRandomizer.h
	* src/TimeA2.{h,cc}
	* src/DownloadCommand.cc
	* src/main.cc

	Removed #ifdef __MINGW32__ since gai_strerror is included in
	a2netcompat.h:
	* src/NameResolver.cc
	
	Fixed compilation error without openssl:
	* src/SocketCore.{h,cc}: Moved include of openssl/err.h to 
SocketCore.h

	Added default block to suppress compiler warnings:
	* src/MetalinkRequestInfo.cc (AccumulateNonP2PUrl::operator())
	
2007-07-26  Ross Smith II  <aria2spam at smithii dot com>

	MinGW build enhancements. The following files are added:
	* src/gai_strerror.{c,h}
	* src/gettimeofday.{c,h}

	Changes to support the above new files:
	* configure.ac
	* src/Makefile.am
	* src/a2netcompat.h
	* src/TimeA2.cc
	* src/DefaultPeerStorage.cc
	* src/NameResolver.cc: removed mingw_strerror() function.
	* src/SocketCore.cc: removed mingw_strerror() function.

	Miscellaneous MinGW build fixes. 
	* src/a2io.h: Use _lseeki64() instead of lseek()
	* src/common.h
	* src/DefaultFileAllocator.cc
	* src/GlowFileAllocator.cc
	* src/main.cc: Moved #include "prefs.h" to quiet compile error.
	* src/NameResolver.cc
	(callback): Changed int32_t to int.
	(resolve): Changed int32_t to int.
	* src/Platform.cc
	* src/Platform.h
	* test/MultiDiskWriterTest.cc
	* test/PeerMessageUtilTest.cc
	* src/localtime_r.c: Add DeleteCriticalSection() and at exit().

	Other enhancements and fixes.
	* src/HttpRequestCommand.cc
	(executeInternal) Use non-blocking socket for HTTPS (MinGW 
only).
	* src/SocketCore.cc: 
	(error): New function to abstract errno/WSAGetLastError().
	(errorMsg): New function to abstract errno/WSAGetLastError().
	(initiateSecureConnection): Added more detailed error reporting.
	* src/SocketCore.h: Added private variable blocking, to allow
	proper handling of OpenSSL psuedo-errors.
	* src/message.h
	(EX_SSL_INIT_FAILURE)
	(EX_SSL_IO_ERROR)
	(EX_SSL_PROTOCOL_ERROR)
	(EX_SSL_UNKNOWN_ERROR)
	(EX_SSL_CONNECT_ERROR)
	(EX_SOCKET_BLOCKING)
	(EX_SOCKET_NONBLOCKING)
	(EX_SOCKET_UNKNOWN_ERROR)
	* src/Util.cc
	(setGlobalSignalHandler): Renamed signal to sig as signal is a
	reserved name.
	(httpGMT): Fixed typo.

3 files changed, 6 insertions, 7 deletions

diff --git a/test/Makefile.in b/test/Makefile.in
index c02f7ee0..943af20c 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -249,8 +249,12 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 HAVE_BASENAME_FALSE = @HAVE_BASENAME_FALSE@
 HAVE_BASENAME_TRUE = @HAVE_BASENAME_TRUE@
+HAVE_GAI_STRERROR_FALSE = @HAVE_GAI_STRERROR_FALSE@
+HAVE_GAI_STRERROR_TRUE = @HAVE_GAI_STRERROR_TRUE@
 HAVE_GETADDRINFO_FALSE = @HAVE_GETADDRINFO_FALSE@
 HAVE_GETADDRINFO_TRUE = @HAVE_GETADDRINFO_TRUE@
+HAVE_GETTIMEOFDAY_FALSE = @HAVE_GETTIMEOFDAY_FALSE@
+HAVE_GETTIMEOFDAY_TRUE = @HAVE_GETTIMEOFDAY_TRUE@
 HAVE_INET_ATON_FALSE = @HAVE_INET_ATON_FALSE@
 HAVE_INET_ATON_TRUE = @HAVE_INET_ATON_TRUE@
 HAVE_LOCALTIME_R_FALSE = @HAVE_LOCALTIME_R_FALSE@
diff --git a/test/MultiDiskWriterTest.cc b/test/MultiDiskWriterTest.cc
index 32dda84b..265b3f81 100644
--- a/test/MultiDiskWriterTest.cc
+++ b/test/MultiDiskWriterTest.cc
@@ -1,12 +1,9 @@
 #include "common.h"
 #include "MultiDiskWriter.h"
+#include "a2io.h"
 #include <string>
 #include <cppunit/extensions/HelperMacros.h>
 
-#ifdef HAVE_IO_H
-# include <io.h>
-#endif // HAVE_IO_H
-
 using namespace std;
 
 class MultiDiskWriterTest:public CppUnit::TestFixture {
diff --git a/test/PeerMessageUtilTest.cc b/test/PeerMessageUtilTest.cc
index 8e670d4c..a3c236e9 100644
--- a/test/PeerMessageUtilTest.cc
+++ b/test/PeerMessageUtilTest.cc
@@ -1,8 +1,6 @@
 #include "common.h"
 #include "PeerMessageUtil.h"
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif // HAVE_NETINET_IN_H
+#include "a2netcompat.h"
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;