aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorGisle Vanem <gvanem@broadpark.no>2007-01-29 20:24:00 +0000
committerGisle Vanem <gvanem@broadpark.no>2007-01-29 20:24:00 +0000
commitd10e174fd1445844f00b84317bb25f90b304dd5d (patch)
treef130d94eade9a317b6163b1c30d18a94635c0ee9 /tests
parente994c6af753a6795bda81ee04eae65a518b2ead9 (diff)
Some compilers lacks <sys/time.h>. Include "timeval.h" to simplify the #ifdefs.
Diffstat (limited to 'tests')
-rw-r--r--tests/libtest/lib503.c5
-rw-r--r--tests/libtest/lib504.c5
-rw-r--r--tests/libtest/lib509.c7
3 files changed, 7 insertions, 10 deletions
diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c
index 66d2c9813..efa6723c1 100644
--- a/tests/libtest/lib503.c
+++ b/tests/libtest/lib503.c
@@ -10,7 +10,6 @@
#include "test.h"
-#include <sys/time.h>
#include <sys/types.h>
#include "timeval.h"
@@ -83,7 +82,7 @@ int test(char *URL)
interval.tv_sec = 1;
interval.tv_usec = 0;
- if (curlx_tvdiff(curlx_tvnow(), ml_start) >
+ if (curlx_tvdiff(curlx_tvnow(), ml_start) >
MAIN_LOOP_HANG_TIMEOUT) {
ml_timedout = TRUE;
break;
@@ -93,7 +92,7 @@ int test(char *URL)
while (res == CURLM_CALL_MULTI_PERFORM) {
res = (int)curl_multi_perform(m, &running);
- if (curlx_tvdiff(curlx_tvnow(), mp_start) >
+ if (curlx_tvdiff(curlx_tvnow(), mp_start) >
MULTI_PERFORM_HANG_TIMEOUT) {
mp_timedout = TRUE;
break;
diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c
index 5b10022df..775468da0 100644
--- a/tests/libtest/lib504.c
+++ b/tests/libtest/lib504.c
@@ -10,7 +10,6 @@
#include "test.h"
-#include <sys/time.h>
#include <sys/types.h>
#include "timeval.h"
@@ -83,7 +82,7 @@ int test(char *URL)
interval.tv_sec = 1;
interval.tv_usec = 0;
- if (curlx_tvdiff(curlx_tvnow(), ml_start) >
+ if (curlx_tvdiff(curlx_tvnow(), ml_start) >
MAIN_LOOP_HANG_TIMEOUT) {
ml_timedout = TRUE;
break;
@@ -97,7 +96,7 @@ int test(char *URL)
while (res == CURLM_CALL_MULTI_PERFORM) {
res = curl_multi_perform(m, &running);
- if (curlx_tvdiff(curlx_tvnow(), mp_start) >
+ if (curlx_tvdiff(curlx_tvnow(), mp_start) >
MULTI_PERFORM_HANG_TIMEOUT) {
mp_timedout = TRUE;
break;
diff --git a/tests/libtest/lib509.c b/tests/libtest/lib509.c
index a911e3654..86e169d8d 100644
--- a/tests/libtest/lib509.c
+++ b/tests/libtest/lib509.c
@@ -12,7 +12,6 @@
#ifdef USE_SSLEAY
-#include <sys/time.h>
#include <sys/types.h>
#include <openssl/opensslv.h>
@@ -33,7 +32,7 @@
#define MAIN_LOOP_HANG_TIMEOUT 30 * 1000
#define MULTI_PERFORM_HANG_TIMEOUT 20 * 1000
-/*
+/*
* We use this ZERO_NULL to avoid picky compiler warnings,
* when assigning a NULL pointer to a function pointer var.
*/
@@ -259,7 +258,7 @@ int test(char *URL)
interval.tv_sec = 1;
interval.tv_usec = 0;
- if (curlx_tvdiff(curlx_tvnow(), ml_start) >
+ if (curlx_tvdiff(curlx_tvnow(), ml_start) >
MAIN_LOOP_HANG_TIMEOUT) {
ml_timedout = TRUE;
break;
@@ -269,7 +268,7 @@ int test(char *URL)
while (res == CURLM_CALL_MULTI_PERFORM) {
res = curl_multi_perform(multi, &running);
- if (curlx_tvdiff(curlx_tvnow(), mp_start) >
+ if (curlx_tvdiff(curlx_tvnow(), mp_start) >
MULTI_PERFORM_HANG_TIMEOUT) {
mp_timedout = TRUE;
break;