diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2020-10-25 22:52:53 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2020-10-25 22:52:53 +0300 |
commit | 8cb26daea6f14cf93a8cdf715b8ed823cf298f64 (patch) | |
tree | 3fda644f9abdceb75a8fa36c8615da34adf09fa9 /src/testcurl/test_get_response_cleanup.c | |
parent | 01fec59041241ccc8510790c929094262ba8454c (diff) | |
download | libmicrohttpd-8cb26daea6f14cf93a8cdf715b8ed823cf298f64.tar.gz libmicrohttpd-8cb26daea6f14cf93a8cdf715b8ed823cf298f64.zip |
Fixed conflict with system CPU_COUNT macro
Diffstat (limited to 'src/testcurl/test_get_response_cleanup.c')
-rw-r--r-- | src/testcurl/test_get_response_cleanup.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/testcurl/test_get_response_cleanup.c b/src/testcurl/test_get_response_cleanup.c index 026fd254..db6ba54f 100644 --- a/src/testcurl/test_get_response_cleanup.c +++ b/src/testcurl/test_get_response_cleanup.c | |||
@@ -53,11 +53,11 @@ | |||
53 | 53 | ||
54 | #include "mhd_has_in_name.h" | 54 | #include "mhd_has_in_name.h" |
55 | 55 | ||
56 | #if defined(CPU_COUNT) && (CPU_COUNT + 0) < 2 | 56 | #if defined(MHD_CPU_COUNT) && (MHD_CPU_COUNT + 0) < 2 |
57 | #undef CPU_COUNT | 57 | #undef MHD_CPU_COUNT |
58 | #endif | 58 | #endif |
59 | #if ! defined(CPU_COUNT) | 59 | #if ! defined(MHD_CPU_COUNT) |
60 | #define CPU_COUNT 2 | 60 | #define MHD_CPU_COUNT 2 |
61 | #endif | 61 | #endif |
62 | 62 | ||
63 | #define TESTSTR "/* DO NOT CHANGE THIS LINE */" | 63 | #define TESTSTR "/* DO NOT CHANGE THIS LINE */" |
@@ -285,7 +285,8 @@ testMultithreadedPoolGet () | |||
285 | ok = 1; | 285 | ok = 1; |
286 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG, | 286 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG, |
287 | port, NULL, NULL, &ahc_echo, "GET", | 287 | port, NULL, NULL, &ahc_echo, "GET", |
288 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); | 288 | MHD_OPTION_THREAD_POOL_SIZE, MHD_CPU_COUNT, |
289 | MHD_OPTION_END); | ||
289 | if (d == NULL) | 290 | if (d == NULL) |
290 | return 64; | 291 | return 64; |
291 | if (0 == port) | 292 | if (0 == port) |