diff options
| author | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 1999-12-22 20:29:19 +0000 |
|---|---|---|
| committer | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 1999-12-22 20:29:19 +0000 |
| commit | d6c5eb490b89775991089a909cf3377aca1e4f40 (patch) | |
| tree | 10af1287ed3e9a590dfaa578c7576a4516c11964 /misc | |
| parent | 733c02d0771ef6b3df597abadda30a2896f2c302 (diff) | |
| download | libapr-d6c5eb490b89775991089a909cf3377aca1e4f40.tar.gz | |
Clean up APR's configure script a bit. This commit also allows Apache to
specify that APR should be built without threads for the prefork MPM. This
is broken if we then try to configure Apache again using a threaded MPM, but
this is easily fixable, and I will be doing that soon. Lastly, I removed all
thread calls from APR when it is told to build without threads.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59552 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/unix/start.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/misc/unix/start.c b/misc/unix/start.c index 86815702d..5df575e0d 100644 --- a/misc/unix/start.c +++ b/misc/unix/start.c @@ -186,14 +186,13 @@ ap_status_t ap_get_userdata(void **data, char *key, struct context_t *cont) */ ap_status_t ap_initialize(void) { -#ifdef HAVE_PTHREAD_SIGMASK sigset_t sigset; sigfillset(&sigset); - /*@@@ FIXME: This should *NOT* be called for the prefork MPM, - * even if HAVE_PTHREAD_SIGMASK is defined!!!! MnKr - */ +#if defined(HAVE_PTHREAD_SIGMASK) && defined(USE_THREADS) pthread_sigmask(SIG_BLOCK, &sigset, NULL); +#else + sigprocmask(SIG_BLOCK, &sigset, NULL); #endif return APR_SUCCESS; } |