You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@hyperreal.org on 1999/10/21 18:43:16 UTC

cvs commit: apache-2.0/src/lib/apr/include apr_portable.h

rbb         99/10/21 09:43:12

  Modified:    src/lib/apr/include apr_portable.h
  Log:
  Remove the check for HAVE_PTHREAD_H from the common code for ap_get_thread*.
  This was an unecessary check, although the APR_HAS_THREADS is required.
  
  Revision  Changes    Path
  1.10      +2 -2      apache-2.0/src/lib/apr/include/apr_portable.h
  
  Index: apr_portable.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- apr_portable.h	1999/10/21 14:31:19	1.9
  +++ apr_portable.h	1999/10/21 16:43:10	1.10
  @@ -192,7 +192,7 @@
   ap_status_t ap_get_os_lock(ap_os_lock_t *, ap_lock_t *);     
   ap_status_t ap_get_os_proc(ap_os_proc_t *, ap_proc_t *);     
   ap_status_t ap_get_os_time(ap_os_time_t **, ap_time_t *);     
  -#if APR_HAS_THREADS && HAVE_PTHREAD_H
  +#if APR_HAS_THREADS
   ap_status_t ap_get_os_thread(ap_os_thread_t *, ap_thread_t *);
   ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *, ap_key_t *);
   #endif
  @@ -203,7 +203,7 @@
   ap_status_t ap_put_os_lock(ap_lock_t **, ap_os_lock_t *, ap_context_t *); 
   ap_status_t ap_put_os_proc(ap_proc_t **, ap_os_proc_t *, ap_context_t *); 
   ap_status_t ap_put_os_time(ap_time_t **, ap_os_time_t *, ap_context_t *); 
  -#if APR_HAS_THREADS && HAVE_PTHREAD_H
  +#if APR_HAS_THREADS
   ap_status_t ap_put_os_thread(ap_thread_t **, ap_os_thread_t *, ap_context_t *);
   ap_status_t ap_put_os_threadkey(ap_key_t **, ap_os_threadkey_t *, ap_context_t *);
   #endif
  
  
  

Re: cvs commit: apache-2.0/src/lib/apr/include apr_portable.h

Posted by Ryan Bloom <rb...@raleigh.ibm.com>.
> Ok, cool. Now I just have to get APR_HAS_THREADS to always be defined on OS/2
> as it currently just tests for libpthread. Any hints? I'm not an autoconf
> expert just yet.

Two suggestions:

1)  Look for APR_HAS_THREADS in configure.in.  It should be easy to
follow.

2)  If it is always going to be defined for OS/2, you could just put 

#if OS2
#define APR_HAS_THREADS
#endif

in aclocal.h in the meantime, until you figure out autoconf well enough to
do it the "right way"

Ryan

_______________________________________________________________________
Ryan Bloom		rbb@raleigh.ibm.com
4205 S Miami Blvd	
RTP, NC 27709		It's a beautiful sight to see good dancers 
			doing simple steps.  It's a painful sight to
			see beginners doing complicated patterns.	


Re: cvs commit: apache-2.0/src/lib/apr/include apr_portable.h

Posted by Brian Havard <br...@kheldar.apana.org.au>.
On 21 Oct 1999 16:43:16 -0000, rbb@hyperreal.org wrote:

>rbb         99/10/21 09:43:12
>
>  Modified:    src/lib/apr/include apr_portable.h
>  Log:
>  Remove the check for HAVE_PTHREAD_H from the common code for ap_get_thread*.
>  This was an unecessary check, although the APR_HAS_THREADS is required.

Ok, cool. Now I just have to get APR_HAS_THREADS to always be defined on OS/2
as it currently just tests for libpthread. Any hints? I'm not an autoconf
expert just yet.

-- 
 ______________________________________________________________________________
 |  Brian Havard                 |  "He is not the messiah!                   |
 |  brianh@kheldar.apana.org.au  |  He's a very naughty boy!" - Life of Brian |
 ------------------------------------------------------------------------------