diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/microhttpd/daemon.c | 4 | ||||
-rw-r--r-- | src/testcurl/Makefile.am | 4 | ||||
-rw-r--r-- | src/testcurl/https/Makefile.am | 4 | ||||
-rw-r--r-- | src/testzzuf/Makefile.am | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 926a983e..2c162def 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -5745,12 +5745,8 @@ MHD_start_daemon_va (unsigned int flags, | |||
5745 | #endif | 5745 | #endif |
5746 | #endif | 5746 | #endif |
5747 | 5747 | ||
5748 | <<<<<<< HEAD | ||
5749 | /* Thread pooling currently works only with internal select thread mode */ | 5748 | /* Thread pooling currently works only with internal select thread mode */ |
5750 | ======= | ||
5751 | /* Thread pooling currently works only with internal select thread model */ | ||
5752 | #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) | 5749 | #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) |
5753 | >>>>>>> add build option to compile MHD without threads | ||
5754 | if ( (0 == (*pflags & MHD_USE_INTERNAL_POLLING_THREAD)) && | 5750 | if ( (0 == (*pflags & MHD_USE_INTERNAL_POLLING_THREAD)) && |
5755 | (daemon->worker_pool_size > 0) ) | 5751 | (daemon->worker_pool_size > 0) ) |
5756 | { | 5752 | { |
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am index 3e703772..e564241c 100644 --- a/src/testcurl/Makefile.am +++ b/src/testcurl/Makefile.am | |||
@@ -82,11 +82,11 @@ endif | |||
82 | endif | 82 | endif |
83 | 83 | ||
84 | if USE_POSIX_THREADS | 84 | if USE_POSIX_THREADS |
85 | check_PROGRAMS += | 85 | check_PROGRAMS += \ |
86 | $(THREAD_ONLY_TESTS) | 86 | $(THREAD_ONLY_TESTS) |
87 | endif | 87 | endif |
88 | if USE_W32_THREADS | 88 | if USE_W32_THREADS |
89 | check_PROGRAMS += | 89 | check_PROGRAMS += \ |
90 | $(THREAD_ONLY_TESTS) | 90 | $(THREAD_ONLY_TESTS) |
91 | endif | 91 | endif |
92 | 92 | ||
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am index 7454ab06..2ea8e2d7 100644 --- a/src/testcurl/https/Makefile.am +++ b/src/testcurl/https/Makefile.am | |||
@@ -38,11 +38,11 @@ check_PROGRAMS = \ | |||
38 | test_https_get_select | 38 | test_https_get_select |
39 | 39 | ||
40 | if USE_POSIX_THREADS | 40 | if USE_POSIX_THREADS |
41 | check_PROGRAMS += | 41 | check_PROGRAMS += \ |
42 | $(THREAD_ONLY_TESTS) | 42 | $(THREAD_ONLY_TESTS) |
43 | endif | 43 | endif |
44 | if USE_W32_THREADS | 44 | if USE_W32_THREADS |
45 | check_PROGRAMS += | 45 | check_PROGRAMS += \ |
46 | $(THREAD_ONLY_TESTS) | 46 | $(THREAD_ONLY_TESTS) |
47 | endif | 47 | endif |
48 | 48 | ||
diff --git a/src/testzzuf/Makefile.am b/src/testzzuf/Makefile.am index be31bad2..cb776891 100644 --- a/src/testzzuf/Makefile.am +++ b/src/testzzuf/Makefile.am | |||
@@ -29,11 +29,11 @@ check_PROGRAMS = \ | |||
29 | test_put_large11 | 29 | test_put_large11 |
30 | 30 | ||
31 | if USE_POSIX_THREADS | 31 | if USE_POSIX_THREADS |
32 | check_PROGRAMS += | 32 | check_PROGRAMS += \ |
33 | $(THREAD_ONLY_TESTS) | 33 | $(THREAD_ONLY_TESTS) |
34 | endif | 34 | endif |
35 | if USE_W32_THREADS | 35 | if USE_W32_THREADS |
36 | check_PROGRAMS += | 36 | check_PROGRAMS += \ |
37 | $(THREAD_ONLY_TESTS) | 37 | $(THREAD_ONLY_TESTS) |
38 | endif | 38 | endif |
39 | 39 | ||