romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-03 19:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

curl: follow-up for commit 5af2bfb9

Browse source 
Use tvnow() and tvdiff() to avoid introducing new linkage issues
This commit is contained in:
Yang Tse 2013-07-31 15:36:56 +02:00
parent 5af2bfb955
commit 14a3139c4d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Makefile.inc
View file

@ -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 \

5
src/tool_cb_prg.c
View file

@ -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 */