Merge branch 'tizen' into tizen_3.0_basesubmit/tizen_3.0_base/20161116.053912submit/tizen_3.0.m2_base/20170104.073748submit/tizen_3.0.m2_base/20170104.072059accepted/tizen/3.0/base/20161118.080913accepted/tizen/3.0.m2/base/20170104.082100tizen_3.0.m2_baseaccepted/tizen_3.0.m2_base

Conflicts:
	packaging/c-ares.spec

Change-Id: Id23d5351f77b4520d8bbcc4c0e1eb09136018b58

1 files changed, 8 insertions, 1 deletions

diff --git a/ares_timeout.c b/ares_timeout.c
index 0b5a435..293e4af 100644
--- a/ares_timeout.c
+++ b/ares_timeout.c
@@ -23,6 +23,13 @@
 #include "ares.h"
 #include "ares_private.h"
 
+/* return time offset between now and (future) check, in milliseconds */
+static long timeoffset(struct timeval *now, struct timeval *check)
+{
+  return (check->tv_sec - now->tv_sec)*1000 +
+         (check->tv_usec - now->tv_usec)/1000;
+}
+
 /* WARNING: Beware that this is linear in the number of outstanding
  * requests! You are probably far better off just calling ares_process()
  * once per second, rather than calling ares_timeout() to figure out
@@ -53,7 +60,7 @@ struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
       query = list_node->data;
       if (query->timeout.tv_sec == 0)
         continue;
-      offset = ares__timeoffset(&now, &query->timeout);
+      offset = timeoffset(&now, &query->timeout);
       if (offset < 0)
         offset = 0;
       if (min_offset == -1 || offset < min_offset)