aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2013-07-31 15:36:56 +0200
committerYang Tse <yangsita@gmail.com>2013-07-31 15:36:56 +0200
commit14a3139c4d3ef2787b2cf74632b66296d2b93b95 (patch)
treeb784b4e29e17b9d963dd2340d7f0ac157a9c66e4 /src
parent5af2bfb9557e36a5e9ad181f7b5edc3d1875e8bc (diff)
curl: follow-up for commit 5af2bfb9
Use tvnow() and tvdiff() to avoid introducing new linkage issues
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.inc3
-rw-r--r--src/tool_cb_prg.c5
2 files changed, 4 insertions, 4 deletions
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 */