Brad House fixed VS2005 compiler warnings due to time_t being 64bit.

He also made recent Microsoft compilers use _strdup() instead of strdup().

diff --git a/ares/CHANGES b/ares/CHANGES
index 3e9f23ca50e606d9da4ea2e821fc61df583a1a32..944255e2e45c624d4ef378a76cdcb0d6ecfd1664 100644 (file)
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -2,6 +2,9 @@
 
 * June 2 2007
 
+- Brad House fixed VS2005 compiler warnings due to time_t being 64bit.
+  He also made recent Microsoft compilers use _strdup() instead of strdup().
+
 - Brad House's man pages for ares_save_options() and ares_destroy_options()
   were added.
 

diff --git a/ares/ares_process.c b/ares/ares_process.c
index efc462a402107f3fd9837edd0b53725ba1b92b1c..745fe682adb588732a6216ecf9fbf8959df39ac9 100644 (file)
--- a/ares/ares_process.c
+++ b/ares/ares_process.c
@@ -63,7 +63,7 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds,
                              ares_socket_t read_fd, time_t now);
 static void process_timeouts(ares_channel channel, time_t now);
 static void process_answer(ares_channel channel, unsigned char *abuf,
-                           int alen, int whichserver, int tcp, int now);
+                           int alen, int whichserver, int tcp, time_t now);
 static void handle_error(ares_channel channel, int whichserver, time_t now);
 static struct query *next_server(ares_channel channel, struct query *query, time_t now);
 static int open_tcp_socket(ares_channel channel, struct server_state *server);
@@ -398,7 +398,7 @@ static void process_timeouts(ares_channel channel, time_t now)
 
 /* Handle an answer from a server. */
 static void process_answer(ares_channel channel, unsigned char *abuf,
-                           int alen, int whichserver, int tcp, int now)
+                           int alen, int whichserver, int tcp, time_t now)
 {
   int id, tc, rcode;
   struct query *query;

diff --git a/ares/ares_timeout.c b/ares/ares_timeout.c
index fa5ae0187810f4ab2c7b4e4efc64ccb5be0d867d..496db845901b5444a4327a41cbc305a0bec645df 100644 (file)
--- a/ares/ares_timeout.c
+++ b/ares/ares_timeout.c
@@ -31,7 +31,8 @@ struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
 {
   struct query *query;
   time_t now;
-  int offset, min_offset;
+  time_t offset, min_offset; /* these use time_t since some 32 bit systems
+                                still use 64 bit time_t! (like VS2005) */
 
   /* No queries, no timeout (and no fetch of the current time). */
   if (!channel->queries)
@@ -57,7 +58,7 @@ struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
    */
   if (min_offset != -1 && (!maxtv || min_offset <= maxtv->tv_sec))
     {
-      tvbuf->tv_sec = min_offset;
+      tvbuf->tv_sec = (long)min_offset;
       tvbuf->tv_usec = 0;
       return tvbuf;
     }

diff --git a/ares/setup.h b/ares/setup.h
index 2106df77088e7f3097641e4cd49ee971bcb74891..a20b8f1b7f64ca99ee7d51ec089aafb9dc2a84e8 100644 (file)
--- a/ares/setup.h
+++ b/ares/setup.h
@@ -144,6 +144,11 @@ int ares_strcasecmp(const char *s1, const char *s2);
    same */
 #define strncasecmp(a,b,c) ares_strncasecmp(a,b,c)
 #define strcasecmp(a,b) ares_strcasecmp(a,b)
+#ifdef _MSC_VER
+#  if _MSC_VER >= 1400
+#    define strdup(a) _strdup(a)
+#  endif
+#endif
 #endif
 
 /* IPv6 compatibility */