You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gr...@locus.apache.org on 2000/08/31 22:38:59 UTC

cvs commit: apache-2.0/src/lib/apr/threadproc/unix threadpriv.c

gregames    00/08/31 13:38:59

  Modified:    src/lib/apr configure.in
               src/lib/apr/threadproc/unix threadpriv.c
  Log:
  Allow dso builds with pthreads enabled to work on platforms which don't have
  pthread_key_delete (e.g. OS/390).  apr_delete_thread_private is currently
  unused.  If/when somebody tries to use apr_delete_thread_private on such a
  platform, the build will fail and we can deal with the missing OS function then.
  
  Revision  Changes    Path
  1.146     +1 -0      apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.145
  retrieving revision 1.146
  diff -u -r1.145 -r1.146
  --- configure.in	2000/08/23 23:28:46	1.145
  +++ configure.in	2000/08/31 20:38:58	1.146
  @@ -509,6 +509,7 @@
   if test "$pthreadh" = "1"; then
       APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS
       APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
  +    AC_CHECK_FUNCS(pthread_key_delete);
   fi
   
   ac_cv_define_READDIR_IS_THREAD_SAFE=no
  
  
  
  1.26      +2 -0      apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- threadpriv.c	2000/08/02 05:26:42	1.25
  +++ threadpriv.c	2000/08/31 20:38:59	1.26
  @@ -99,6 +99,7 @@
       }
   }
   
  +#ifdef HAVE_PTHREAD_KEY_DELETE
   apr_status_t apr_delete_thread_private(apr_threadkey_t *key)
   {
       apr_status_t stat;
  @@ -107,6 +108,7 @@
       }
       return stat;
   }
  +#endif
   
   apr_status_t apr_get_threadkeydata(void **data, const char *key,
                                    apr_threadkey_t *threadkey)