It gets you (and I) the apr_thread_pool_get declaration that _used_ to hide within this very same block, which was bad mojo.
Bill ----- Original Message ----- From: "Brian Havard" <[EMAIL PROTECTED]> To: <[email protected]> Sent: Friday, July 27, 2001 5:41 AM Subject: Re: cvs commit: apr/include apr_thread_proc.h > Ouch! This breaks OS/2 as the !defined(OS2) condition doesn't make it into > exports.c. Changing it to > > #if APR_HAVE_SIGWAIT && !defined(OS2) > > fixes it but I'd like to know what the below patch actually achieves. > > > On 27 Jul 2001 05:37:13 -0000, [EMAIL PROTECTED] wrote: > > >wrowe 01/07/26 22:37:13 > > > > Modified: include apr_thread_proc.h > > Log: > > Nasty... OS2 needs checking out, still having trouble with Win32. > > This doesn't hold us up, since win32 didn't use the threading library. > > > > Revision Changes Path > > 1.67 +6 -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.66 > > retrieving revision 1.67 > > diff -u -r1.66 -r1.67 > > --- apr_thread_proc.h 2001/07/24 05:16:32 1.66 > > +++ apr_thread_proc.h 2001/07/27 05:37:13 1.67 > > @@ -585,8 +585,10 @@ > > APR_DECLARE(void) apr_pool_note_subprocess(apr_pool_t *a, apr_proc_t *pid, > > enum kill_conditions how); > > > > -#if APR_HAS_THREADS && !defined(OS2) && APR_HAVE_SIGWAIT > > +#if APR_HAS_THREADS > > > > +#if !defined(OS2) && APR_HAVE_SIGWAIT > > + > > /** > > * Setup the process for a single thread to be used for all signal > > handling. > > * @warn This must be called before any threads are created > > @@ -603,10 +605,12 @@ > > */ > > APR_DECLARE(apr_status_t) apr_signal_thread(int(*signal_handler)(int > > signum)); > > > > +#endif /* !defined(OS2) && APR_HAVE_SIGWAIT */ > > + > > /** > > * Get the child-pool used by the thread from the thread info. > > * @return apr_pool_t the pool > > - * @deffunc apr_pool_t apr_thread_info_pool_get(apr_thread_info_t *i) > > + * @deffunc apr_pool_t apr_thread_pool_get(apr_thread_t *i) > > */ > > APR_POOL_DECLARE_ACCESSOR(thread); > > > > > > > > > > > > -- > > ______________________________________________________________________________ > | Brian Havard | "He is not the messiah! > | > | [EMAIL PROTECTED] | He's a very naughty boy!" - Life of Brian | > > ------------------------------------------------------------------------------ > >
