From 8b28e693b25992174be3e865ea444414713b27ec Mon Sep 17 00:00:00 2001 From: "Evgeny Grin (Karlson2k)" Date: Tue, 18 Feb 2014 18:39:31 +0000 Subject: add sleep() and usleep() replacement for W32 --- src/examples/authorization_example.c | 6 ++++++ src/include/platform.h | 2 ++ src/testcurl/https/test_https_time_out.c | 7 +++++++ src/testcurl/test_get.c | 7 +++++-- src/testcurl/test_get_response_cleanup.c | 7 +++++++ src/testcurl/test_iplimit.c | 7 +++++++ src/testcurl/test_post.c | 7 +++++++ src/testcurl/test_termination.c | 7 +++++++ src/testcurl/test_urlparse.c | 7 +++++-- src/testspdy/test_proxies.c | 7 +++++++ src/testzzuf/socat.c | 7 +++++++ 11 files changed, 67 insertions(+), 4 deletions(-) diff --git a/src/examples/authorization_example.c b/src/examples/authorization_example.c index bb480267..39dd3966 100644 --- a/src/examples/authorization_example.c +++ b/src/examples/authorization_example.c @@ -25,6 +25,12 @@ #include "platform.h" #include +#ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN 1 +#endif /* !WIN32_LEAN_AND_MEAN */ +#include +#endif #define PAGE "libmicrohttpd demolibmicrohttpd demo" diff --git a/src/include/platform.h b/src/include/platform.h index 1ee0ee1c..84c381d7 100644 --- a/src/include/platform.h +++ b/src/include/platform.h @@ -120,6 +120,8 @@ #if defined(_WIN32) && !defined(__CYGWIN__) #include +#define sleep(seconds) (SleepEx((seconds)*1000, 1)/1000) +#define usleep(useconds) (void)SleepEx((useconds)/1000, 1) #endif #ifndef MHD_SOCKET_DEFINED diff --git a/src/testcurl/https/test_https_time_out.c b/src/testcurl/https/test_https_time_out.c index f8f3c99d..0e304327 100644 --- a/src/testcurl/https/test_https_time_out.c +++ b/src/testcurl/https/test_https_time_out.c @@ -31,6 +31,13 @@ #include "tls_test_common.h" #include +#ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN 1 +#endif /* !WIN32_LEAN_AND_MEAN */ +#include +#endif + extern const char srv_key_pem[]; extern const char srv_self_signed_cert_pem[]; diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c index 855a0742..6043fe3c 100644 --- a/src/testcurl/test_get.c +++ b/src/testcurl/test_get.c @@ -34,8 +34,11 @@ #include #include -#ifdef __MINGW32__ -#define usleep(usec) (Sleep ((usec) / 1000),0) +#ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN 1 +#endif /* !WIN32_LEAN_AND_MEAN */ +#include #endif #ifndef WINDOWS diff --git a/src/testcurl/test_get_response_cleanup.c b/src/testcurl/test_get_response_cleanup.c index 81615766..39d7ece6 100644 --- a/src/testcurl/test_get_response_cleanup.c +++ b/src/testcurl/test_get_response_cleanup.c @@ -41,6 +41,13 @@ #include #endif +#ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN 1 +#endif /* !WIN32_LEAN_AND_MEAN */ +#include +#endif + #define TESTSTR "/* DO NOT CHANGE THIS LINE */" static int oneone; diff --git a/src/testcurl/test_iplimit.c b/src/testcurl/test_iplimit.c index 0b2b9b6c..cf06a972 100644 --- a/src/testcurl/test_iplimit.c +++ b/src/testcurl/test_iplimit.c @@ -37,6 +37,13 @@ #include #endif +#ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN 1 +#endif /* !WIN32_LEAN_AND_MEAN */ +#include +#endif + static int oneone; struct CBC diff --git a/src/testcurl/test_post.c b/src/testcurl/test_post.c index f735c630..a0be0f94 100644 --- a/src/testcurl/test_post.c +++ b/src/testcurl/test_post.c @@ -36,6 +36,13 @@ #include #endif +#ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN 1 +#endif /* !WIN32_LEAN_AND_MEAN */ +#include +#endif + #define POST_DATA "name=daniel&project=curl" static int oneone; diff --git a/src/testcurl/test_termination.c b/src/testcurl/test_termination.c index 36e81fdc..5af907a0 100644 --- a/src/testcurl/test_termination.c +++ b/src/testcurl/test_termination.c @@ -41,6 +41,13 @@ #include #endif +#ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN 1 +#endif /* !WIN32_LEAN_AND_MEAN */ +#include +#endif + static int connection_handler (void *cls, struct MHD_Connection *connection, diff --git a/src/testcurl/test_urlparse.c b/src/testcurl/test_urlparse.c index 8a809073..0f87ac4d 100644 --- a/src/testcurl/test_urlparse.c +++ b/src/testcurl/test_urlparse.c @@ -32,8 +32,11 @@ #include #include -#ifdef __MINGW32__ -#define usleep(usec) (Sleep ((usec) / 1000),0) +#ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN 1 +#endif /* !WIN32_LEAN_AND_MEAN */ +#include #endif #ifndef WINDOWS diff --git a/src/testspdy/test_proxies.c b/src/testspdy/test_proxies.c index 38d5f3cb..751c2a7a 100644 --- a/src/testspdy/test_proxies.c +++ b/src/testspdy/test_proxies.c @@ -34,6 +34,13 @@ #include /* pid_t */ #include "common.h" +#ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN 1 +#endif /* !WIN32_LEAN_AND_MEAN */ +#include +#endif + #define EXPECTED_BODY "libmicrohttpd demolibmicrohttpd demo" diff --git a/src/testzzuf/socat.c b/src/testzzuf/socat.c index e4559a02..9b351197 100644 --- a/src/testzzuf/socat.c +++ b/src/testzzuf/socat.c @@ -29,6 +29,13 @@ #include #include +#ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN 1 +#endif /* !WIN32_LEAN_AND_MEAN */ +#include +#endif + /** * A larger loop count will run more random tests -- -- cgit v1.2.3