From: Yang Tse <yangsita@gmail.com>
Date: Wed, 31 Jul 2013 13:36:56 +0000 (+0200)
Subject: curl: follow-up for commit 5af2bfb9
X-Git-Tag: upstream/7.37.1~1502
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14a3139c4d3ef2787b2cf74632b66296d2b93b95;p=platform%2Fupstream%2Fcurl.git

curl: follow-up for commit 5af2bfb9

Use tvnow() and tvdiff() to avoid introducing new linkage issues
---

diff --git a/src/Makefile.inc b/src/Makefile.inc
index 09bd9e804..cd890accc 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -13,8 +13,7 @@ CURLX_ONES = \
 	../lib/strtoofft.c \
 	../lib/strdup.c \
 	../lib/rawstr.c \
-	../lib/nonblock.c \
-	../lib/timeval.c
+	../lib/nonblock.c
 
 CURL_CFILES = \
 	tool_binmode.c \
diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c
index b94442be8..cc0212648 100644
--- a/src/tool_cb_prg.c
+++ b/src/tool_cb_prg.c
@@ -27,6 +27,7 @@
 
 #include "tool_cfgable.h"
 #include "tool_cb_prg.h"
+#include "tool_util.h"
 
 #include "memdebug.h" /* keep this as LAST include */
 
@@ -49,12 +50,12 @@ int tool_progress_cb(void *clientp,
   double percent;
   int barwidth;
   int num;
-  struct timeval now = curlx_tvnow();
+  struct timeval now = tvnow();
   struct ProgressData *bar = (struct ProgressData *)clientp;
   curl_off_t total;
   curl_off_t point;
 
-  if(curlx_tvdiff(now, bar->prevtime) < 200) /* allow 5 Hz */
+  if(tvdiff(now, bar->prevtime) < 200L) /* allow 5 Hz */
     return 0;
 
   /* expected transfer size */