diff options
| author | Jacob Champion <jchampion@apache.org> | 2017-04-14 02:14:24 +0200 |
|---|---|---|
| committer | Jacob Champion <jchampion@apache.org> | 2017-04-14 02:14:24 +0200 |
| commit | 4eeb7b5d2d607da42282e5705e0f1c3148093f21 (patch) | |
| tree | 712288e6b684b0578df90f9b6ef9b1af923122d0 /acinclude.m4 | |
| parent | configure: check if &errno is thread-local for OpenSSL (diff) | |
| download | apache2-4eeb7b5d2d607da42282e5705e0f1c3148093f21.tar.xz apache2-4eeb7b5d2d607da42282e5705e0f1c3148093f21.zip | |
configure: bump thread count for the &errno test
Increase the number of threads from three to ten. Patch by rjung.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791309 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 254e789a44..14c02a1e83 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -653,7 +653,7 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[ #include "apr_thread_cond.h" #include "apr_thread_proc.h" - #define NUM_THREADS 3 + #define NUM_THREADS 10 struct thread_data { apr_thread_mutex_t *mutex; @@ -692,6 +692,7 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[ int ret = 0; apr_status_t status; int i; + int j; apr_pool_t *pool; apr_thread_mutex_t *mutex; @@ -738,10 +739,13 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[ } /* Check that no addresses were duplicated. */ - if ((tdata[0].errno_addr == tdata[1].errno_addr) - || (tdata[1].errno_addr == tdata[2].errno_addr) - || (tdata[0].errno_addr == tdata[2].errno_addr)) { - ret = 5; + for (i = 0; i < NUM_THREADS - 1; ++i) { + for (j = i + 1; j < NUM_THREADS; ++j) { + if (tdata[i].errno_addr == tdata[j].errno_addr) { + ret = 5; + goto out; + } + } } out: |