diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-08-24 15:02:10 +0000 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-08-24 15:02:10 +0000 |
commit | 9826ad54e0de815ca9a2b071717dc8aed1ce1a5c (patch) | |
tree | 72da2ca91f3bd6ae8ed23d8614db888a3510cd16 /src/testcurl | |
parent | dfbda8ae1ee98455a488de3a78ae4fd198e57cd4 (diff) | |
download | libmicrohttpd-9826ad54e0de815ca9a2b071717dc8aed1ce1a5c.tar.gz libmicrohttpd-9826ad54e0de815ca9a2b071717dc8aed1ce1a5c.zip |
Refactoring: do not define EPOLL_SUPPORT if epoll is disabled or not supported.
Diffstat (limited to 'src/testcurl')
-rw-r--r-- | src/testcurl/https/test_https_get_parallel.c | 4 | ||||
-rw-r--r-- | src/testcurl/https/test_https_get_select.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c index cf32a021..5b1b23f5 100644 --- a/src/testcurl/https/test_https_get_parallel.c +++ b/src/testcurl/https/test_https_get_parallel.c | |||
@@ -147,7 +147,7 @@ main (int argc, char *const *argv) | |||
147 | 147 | ||
148 | if (curl_uses_nss_ssl() == 0) | 148 | if (curl_uses_nss_ssl() == 0) |
149 | aes256_sha = "rsa_aes_256_sha"; | 149 | aes256_sha = "rsa_aes_256_sha"; |
150 | #if EPOLL_SUPPORT | 150 | #ifdef EPOLL_SUPPORT |
151 | errorCount += | 151 | errorCount += |
152 | test_wrap ("single threaded daemon, single client, epoll", &test_single_client, | 152 | test_wrap ("single threaded daemon, single client, epoll", &test_single_client, |
153 | NULL, | 153 | NULL, |
@@ -163,7 +163,7 @@ main (int argc, char *const *argv) | |||
163 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 163 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, |
164 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 164 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
165 | srv_self_signed_cert_pem, MHD_OPTION_END); | 165 | srv_self_signed_cert_pem, MHD_OPTION_END); |
166 | #if EPOLL_SUPPORT | 166 | #ifdef EPOLL_SUPPORT |
167 | errorCount += | 167 | errorCount += |
168 | test_wrap ("single threaded daemon, parallel clients, epoll", | 168 | test_wrap ("single threaded daemon, parallel clients, epoll", |
169 | &test_parallel_clients, NULL, | 169 | &test_parallel_clients, NULL, |
diff --git a/src/testcurl/https/test_https_get_select.c b/src/testcurl/https/test_https_get_select.c index 487b475e..e3e7af93 100644 --- a/src/testcurl/https/test_https_get_select.c +++ b/src/testcurl/https/test_https_get_select.c | |||
@@ -223,7 +223,7 @@ main (int argc, char *const *argv) | |||
223 | fprintf (stderr, "Error: %s\n", strerror (errno)); | 223 | fprintf (stderr, "Error: %s\n", strerror (errno)); |
224 | return -1; | 224 | return -1; |
225 | } | 225 | } |
226 | #if EPOLL_SUPPORT | 226 | #ifdef EPOLL_SUPPORT |
227 | if (0 != (errorCount = testExternalGet (MHD_USE_EPOLL_LINUX_ONLY))) | 227 | if (0 != (errorCount = testExternalGet (MHD_USE_EPOLL_LINUX_ONLY))) |
228 | fprintf (stderr, "Fail: %d\n", errorCount); | 228 | fprintf (stderr, "Fail: %d\n", errorCount); |
229 | #endif | 229 | #endif |