moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed Visual Studio 2010 compilation

This commit is contained in:
Sergei Nikulov 2012-11-09 17:29:02 +04:00 committed by Daniel Stenberg
parent 076e1fa348
commit 7c0cbcf2f6
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/libtest/lib1501.c
View File

@ -98,13 +98,13 @@ int test(char *URL)
abort_on_test_timeout();
fprintf(stderr, "ping\n");
gettimeofday(&before, 0);
before = tutil_tvnow();
multi_perform(mhandle, &still_running);
abort_on_test_timeout();
gettimeofday(&after, 0);
after = tutil_tvnow();
e = elapsed(&before, &after);
fprintf(stderr, "pong = %d\n", e);

5
tests/libtest/lib582.c
View File

@ -133,7 +133,7 @@ static int curlTimerCallback(CURLM *multi, long timeout_ms, void *userp)
(void)multi; /* unused */
if (timeout_ms != -1) {
gettimeofday(timeout, 0);
*timeout = tutil_tvnow();
timeout->tv_usec += timeout_ms * 1000;
}
else {
@ -173,8 +173,7 @@ static int getMicroSecondTimeout(struct timeval* timeout)
{
struct timeval now;
ssize_t result;
gettimeofday(&now, 0);
now = tutil_tvnow();
result = (timeout->tv_sec - now.tv_sec) * 1000000 +
timeout->tv_usec - now.tv_usec;
if (result < 0)

8
tests/libtest/libauthretry.c
View File

@ -25,7 +25,7 @@
*/
#include "test.h"
#include "strequal.h"
#include "memdebug.h"
static int send_request(CURL *curl, const char *url, int seq,
@ -72,11 +72,11 @@ static long parse_auth_name(const char *arg)
{
if (!arg)
return CURLAUTH_NONE;
if (strcasecmp(arg, "basic") == 0)
if (strequal(arg, "basic") == 0)
return CURLAUTH_BASIC;
if (strcasecmp(arg, "digest") == 0)
if (strequal(arg, "digest") == 0)
return CURLAUTH_DIGEST;
if (strcasecmp(arg, "ntlm") == 0)
if (strequal(arg, "ntlm") == 0)
return CURLAUTH_NTLM;
return CURLAUTH_NONE;
}

3
tests/libtest/testtrace.c
View File

@ -22,6 +22,9 @@
#include "test.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "testutil.h"
#include "testtrace.h"
#include "memdebug.h"