diff options
| author | Sascha Schumann <sascha@apache.org> | 2000-04-29 23:57:54 +0000 |
|---|---|---|
| committer | Sascha Schumann <sascha@apache.org> | 2000-04-29 23:57:54 +0000 |
| commit | 0cfb1d0be3114ff70b5025d0763b7d8d39ea166e (patch) | |
| tree | ba2ed52184375e237f4073fe8423f0003c00f315 | |
| parent | d2892da2e646082d452813573d728e48fd6af071 (diff) | |
| download | httpd-0cfb1d0be3114ff70b5025d0763b7d8d39ea166e.tar.gz | |
Add ap_sigwait() to support old-style sigwait().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85101 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rw-r--r-- | server/mpm/config.m4 | 1 | ||||
| -rw-r--r-- | server/mpm/dexter/dexter.c | 2 | ||||
| -rw-r--r-- | server/mpm/mpmt_pthread/mpmt_pthread.c | 2 |
4 files changed, 21 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2113a9423e..1f19e59a1b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -177,6 +177,24 @@ unsigned long foo = INADDR_NONE; fi ]) +AC_DEFUN(APACHE_CHECK_SIGWAIT_ONE_ARG,[ + AC_CACHE_CHECK(whether sigwait takes one argument,ac_cv_sigwait_one_arg,[ + AC_TRY_COMPILE([ +#include <signal.h> +],[ + sigset_t set; + + sigwait(&set); +],[ + ac_cv_sigwait_one_arg=yes +],[ + ac_cv_sigwait_one_arg=no +])]) + if test "$ac_cv_sigwait_one_arg" = "yes"; then + AC_DEFINE(SIGWAIT_TAKES_ONE_ARG,1,[ ]) + fi +]) + AC_DEFUN(APACHE_CHECK_SHM_RW,[ AC_CACHE_CHECK([whether system defines SHM_R,SHM_W],ac_cv_shm_rw,[ AC_TRY_COMPILE([ diff --git a/server/mpm/config.m4 b/server/mpm/config.m4 index f431db5a4e..2e3d53bd3c 100644 --- a/server/mpm/config.m4 +++ b/server/mpm/config.m4 @@ -29,6 +29,7 @@ if test "$apache_cv_mpm" = "mpmt_pthread" -o "$apache_cv_mpm" = "dexter"; then fi fi +APACHE_CHECK_SIGWAIT_ONE_ARG APACHE_CHECK_SHM_RW APACHE_FAST_OUTPUT(modules/mpm/Makefile) diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c index c3e6362e82..fcebdcd2b1 100644 --- a/server/mpm/dexter/dexter.c +++ b/server/mpm/dexter/dexter.c @@ -928,7 +928,7 @@ static void child_main(int child_num_arg) sigemptyset(&sig_mask); sigaddset(&sig_mask, SIGTERM); sigaddset(&sig_mask, SIGINT); - sigwait(&sig_mask, &signal_received); + ap_sigwait(&sig_mask, &signal_received); switch (signal_received) { case SIGTERM: case SIGINT: diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c index 6c1c92b1bd..ee736b584e 100644 --- a/server/mpm/mpmt_pthread/mpmt_pthread.c +++ b/server/mpm/mpmt_pthread/mpmt_pthread.c @@ -892,7 +892,7 @@ static void child_main(int child_num_arg) sigemptyset(&sig_mask); sigaddset(&sig_mask, SIGTERM); sigaddset(&sig_mask, SIGINT); - sigwait(&sig_mask, &signal_received); + ap_sigwait(&sig_mask, &signal_received); switch (signal_received) { case SIGTERM: case SIGINT: |