diff options
| author | Marc Hoersken <info@marc-hoersken.de> | 2020-03-04 16:11:03 +0100 |
|---|---|---|
| committer | Marc Hoersken <info@marc-hoersken.de> | 2020-03-04 16:11:03 +0100 |
| commit | 3c1b9145c78de3370c548ead90537c91d9803073 (patch) | |
| tree | 69f107053962829af30e44d5e128d45610c723ba | |
| parent | 9aaca09044de4d4116822f25d2cf9c780d7465ce (diff) | |
| download | curl-3c1b9145c78de3370c548ead90537c91d9803073.tar.gz | |
tests: align some Windows sleep defines with each other
| -rw-r--r-- | tests/libtest/lib1515.c | 2 | ||||
| -rw-r--r-- | tests/libtest/lib1531.c | 2 | ||||
| -rw-r--r-- | tests/server/util.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/libtest/lib1515.c b/tests/libtest/lib1515.c index c72554a3b..b879836f9 100644 --- a/tests/libtest/lib1515.c +++ b/tests/libtest/lib1515.c @@ -36,7 +36,7 @@ #define DNS_TIMEOUT 1 #if defined(WIN32) || defined(_WIN32) -#define sleep(s) Sleep(s * 1000) +#define sleep(sec) Sleep ((sec)*1000) #endif static int debug_callback(CURL *curl, curl_infotype info, char *msg, diff --git a/tests/libtest/lib1531.c b/tests/libtest/lib1531.c index 4a4dc133a..5c9399559 100644 --- a/tests/libtest/lib1531.c +++ b/tests/libtest/lib1531.c @@ -107,7 +107,7 @@ int test(char *URL) curl_multi_fdset() doc. */ if(maxfd == -1) { -#ifdef _WIN32 +#if defined(WIN32) || defined(_WIN32) Sleep(100); rc = 0; #else diff --git a/tests/server/util.h b/tests/server/util.h index 7b4ec1626..236d4550e 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -37,16 +37,16 @@ extern const char *path; /* global variable, log file name */ extern const char *serverlogfile; -#ifdef WIN32 +#if defined(WIN32) || defined(_WIN32) #include <process.h> #include <fcntl.h> -#define sleep(sec) Sleep ((sec)*1000) +#define sleep(sec) Sleep ((sec)*1000) #undef perror #define perror(m) win32_perror(m) void win32_perror(const char *msg); -#endif /* WIN32 */ +#endif /* WIN32 or _WIN32 */ #ifdef USE_WINSOCK void win32_init(void); |