[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 237/282: tests: align some Windows sleep defines with each other
From: |
gnunet |
Subject: |
[gnurl] 237/282: tests: align some Windows sleep defines with each other |
Date: |
Wed, 01 Apr 2020 14:31:42 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 3c1b9145c78de3370c548ead90537c91d9803073
Author: Marc Hoersken <address@hidden>
AuthorDate: Wed Mar 4 16:11:03 2020 +0100
tests: align some Windows sleep defines with each other
---
tests/libtest/lib1515.c | 2 +-
tests/libtest/lib1531.c | 2 +-
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);
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 200/282: mime: do not perform more than one read in a row, (continued)
- [gnurl] 200/282: mime: do not perform more than one read in a row, gnunet, 2020/04/01
- [gnurl] 218/282: sha256: Added GNU TLS gcrypt implementation, gnunet, 2020/04/01
- [gnurl] 215/282: curl_getenv.3: Fix the memory handling description, gnunet, 2020/04/01
- [gnurl] 211/282: http: mark POSTs with no body as "upload done" from the start, gnunet, 2020/04/01
- [gnurl] 212/282: multi_wait: stop loop when sread() returns zero, gnunet, 2020/04/01
- [gnurl] 227/282: ci/tests: Move CI test result creation above environment setup, gnunet, 2020/04/01
- [gnurl] 228/282: README.md: add Azure DevOps Pipelines build status badge, gnunet, 2020/04/01
- [gnurl] 230/282: cmake: Show HTTPS-proxy in the features output, gnunet, 2020/04/01
- [gnurl] 226/282: ci/tests: Send test results to AppVeyor for status overview, gnunet, 2020/04/01
- [gnurl] 231/282: ci/tests: fix escaping of testnames and disable proxy for CI APIs, gnunet, 2020/04/01
- [gnurl] 237/282: tests: align some Windows sleep defines with each other,
gnunet <=
- [gnurl] 236/282: tests: try to make sleeping portable by avoiding select, gnunet, 2020/04/01
- [gnurl] 233/282: RELEASE-NOTES: 7.69.0, gnunet, 2020/04/01
- [gnurl] 244/282: urldata: remove the 'stream_was_rewound' connectdata struct member, gnunet, 2020/04/01
- [gnurl] 229/282: ci/tests: Make it possible to still run but ignore failing tests, gnunet, 2020/04/01
- [gnurl] 235/282: runtests.1: rephrase how to specify what tests to run, gnunet, 2020/04/01
- [gnurl] 241/282: MANUAL: update a dict-using command line, gnunet, 2020/04/01
- [gnurl] 232/282: THANKS: from 7.69.0, gnunet, 2020/04/01
- [gnurl] 245/282: transfer: set correct copyright year range, gnunet, 2020/04/01
- [gnurl] 239/282: polarssl: remove more references and mentions, gnunet, 2020/04/01
- [gnurl] 242/282: RELEASE-NOTES: synced, gnunet, 2020/04/01