You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2003/07/07 16:49:49 UTC

cvs commit: apr/threadproc/unix signals.c

jorton      2003/07/07 07:49:48

  Modified:    threadproc/unix signals.c
  Log:
  Pick up the result of the AC_DECL_SYS_SIGLIST macro correctly with
  recent versions of autoconf.
  
  Revision  Changes    Path
  1.54      +5 -4      apr/threadproc/unix/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/unix/signals.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -u -r1.53 -r1.54
  --- signals.c	6 Jan 2003 23:44:38 -0000	1.53
  +++ signals.c	7 Jul 2003 14:49:48 -0000	1.54
  @@ -139,8 +139,9 @@
   
   #endif /* HAVE_SIGACTION */
   
  -
  -#ifdef SYS_SIGLIST_DECLARED
  +/* AC_DECL_SYS_SIGLIST defines either of these symbols depending
  + * on the version of autoconf used. */
  +#if defined(SYS_SIGLIST_DECLARED) || defined(HAVE_DECL_SYS_SIGLIST)
   
   void apr_signal_init(apr_pool_t *pglobal)
   {
  @@ -150,7 +151,7 @@
       return sys_siglist[signum];
   }
   
  -#else /* !SYS_SIGLIST_DECLARED */
  +#else /* !(SYS_SIGLIST_DECLARED || HAVE_DECL_SYS_SIGLIST) */
   
   /* we need to roll our own signal description stuff */
   
  @@ -298,7 +299,7 @@
           : "unknown signal (number)";
   }
   
  -#endif /* SYS_SIGLIST_DECLARED */
  +#endif /* SYS_SIGLIST_DECLARED || HAVE_DECL_SYS_SIGLIST */
   
   #if APR_HAS_THREADS && (HAVE_SIGSUSPEND || APR_HAVE_SIGWAIT) && !defined(OS2)