Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 17213 invoked by uid 500); 11 Apr 2002 04:36:56 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 17202 invoked from network); 11 Apr 2002 04:36:55 -0000 Date: 11 Apr 2002 04:36:54 -0000 Message-ID: <20020411043654.1275.qmail@icarus.apache.org> From: trawick@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/include apr.h.in apr.hnw apr.hw apr_thread_proc.h X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N trawick 02/04/10 21:36:54 Modified: . configure.in include apr.h.in apr.hnw apr.hw apr_thread_proc.h Log: systems where sigsuspend() is used in lieu of sigwait() need the declarations of apr_setup_signal_thread() and apr_signal_thread() too; this fixes some worker MPM warnings on Darwin Revision Changes Path 1.427 +2 -1 apr/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/apr/configure.in,v retrieving revision 1.426 retrieving revision 1.427 diff -u -r1.426 -r1.427 --- configure.in 10 Apr 2002 18:58:47 -0000 1.426 +++ configure.in 11 Apr 2002 04:36:54 -0000 1.427 @@ -547,7 +547,7 @@ echo "APR will be non-threaded" fi -AC_CHECK_FUNCS(sigsuspend) +AC_CHECK_FUNCS(sigsuspend, [ have_sigsuspend="1" ], [ have_sigsuspend="0" ]) AC_CHECK_FUNCS(sigwait, [ have_sigwait="1" ], [ have_sigwait="0" ]) dnl AC_CHECK_FUNCS doesn't work for this on Tru64 since the function dnl is renamed in signal.h. Todo: Autodetect @@ -558,6 +558,7 @@ esac AC_SUBST(threads) +AC_SUBST(have_sigsuspend) AC_SUBST(have_sigwait) AC_CHECK_FUNCS(poll) 1.106 +1 -0 apr/include/apr.h.in Index: apr.h.in =================================================================== RCS file: /home/cvs/apr/include/apr.h.in,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- apr.h.in 4 Apr 2002 18:33:56 -0000 1.105 +++ apr.h.in 11 Apr 2002 04:36:54 -0000 1.106 @@ -106,6 +106,7 @@ #define APR_HAVE_MEMMOVE @have_memmove@ #define APR_HAVE_SETRLIMIT @have_setrlimit@ #define APR_HAVE_SIGACTION @have_sigaction@ +#define APR_HAVE_SIGSUSPEND @have_sigsuspend@ #define APR_HAVE_SIGWAIT @have_sigwait@ #define APR_HAVE_STRCASECMP @have_strcasecmp@ #define APR_HAVE_STRDUP @have_strdup@ 1.13 +1 -0 apr/include/apr.hnw Index: apr.hnw =================================================================== RCS file: /home/cvs/apr/include/apr.hnw,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- apr.hnw 26 Mar 2002 16:50:00 -0000 1.12 +++ apr.hnw 11 Apr 2002 04:36:54 -0000 1.13 @@ -173,6 +173,7 @@ #define APR_HAVE_MEMMOVE 1 #define APR_HAVE_SETRLIMIT 0 #define APR_HAVE_SIGACTION 0 +#define APR_HAVE_SIGSUSPEND 0 #define APR_HAVE_SIGWAIT 0 #define APR_HAVE_STRCASECMP 1 #define APR_HAVE_STRDUP 1 1.93 +1 -0 apr/include/apr.hw Index: apr.hw =================================================================== RCS file: /home/cvs/apr/include/apr.hw,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- apr.hw 22 Mar 2002 06:06:26 -0000 1.92 +++ apr.hw 11 Apr 2002 04:36:54 -0000 1.93 @@ -196,6 +196,7 @@ #define APR_HAVE_MEMMOVE 1 #define APR_HAVE_SETRLIMIT 0 #define APR_HAVE_SIGACTION 0 +#define APR_HAVE_SIGSUSPEND 0 #define APR_HAVE_SIGWAIT 0 #define APR_HAVE_STRCASECMP 0 #define APR_HAVE_STRDUP 1 1.86 +2 -2 apr/include/apr_thread_proc.h Index: apr_thread_proc.h =================================================================== RCS file: /home/cvs/apr/include/apr_thread_proc.h,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- apr_thread_proc.h 22 Mar 2002 06:06:26 -0000 1.85 +++ apr_thread_proc.h 11 Apr 2002 04:36:54 -0000 1.86 @@ -652,7 +652,7 @@ #if APR_HAS_THREADS -#if APR_HAVE_SIGWAIT && !defined(OS2) +#if (APR_HAVE_SIGWAIT || APR_HAVE_SIGSUSPEND) && !defined(OS2) /** * Setup the process for a single thread to be used for all signal handling. @@ -669,7 +669,7 @@ */ APR_DECLARE(apr_status_t) apr_signal_thread(int(*signal_handler)(int signum)); -#endif /* !defined(OS2) && APR_HAVE_SIGWAIT */ +#endif /* (APR_HAVE_SIGWAIT || APR_HAVE_SIGSUSPEND) && !defined(OS2) */ /** * Get the child-pool used by the thread from the thread info.