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 2004/01/25 17:52:08 UTC

cvs commit: apr/threadproc/unix threadpriv.c

jorton      2004/01/25 08:52:08

  Modified:    threadproc/unix Tag: APR_0_9_BRANCH threadpriv.c
  Log:
  Backport from HEAD:
  
  * threadproc/unix/threadpriv.c (apr_threadkey_private_delete):
  Define function regardless of HAVE_PTHREAD_KEY_DELETE.
  
  PR: 23837
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.38.2.1  +4 -2      apr/threadproc/unix/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/unix/threadpriv.c,v
  retrieving revision 1.38
  retrieving revision 1.38.2.1
  diff -b -d -u -r1.38 -r1.38.2.1
  --- threadpriv.c	6 Jan 2003 23:44:38 -0000	1.38
  +++ threadpriv.c	25 Jan 2004 16:52:08 -0000	1.38.2.1
  @@ -100,9 +100,9 @@
       }
   }
   
  -#ifdef HAVE_PTHREAD_KEY_DELETE
   APR_DECLARE(apr_status_t) apr_threadkey_private_delete(apr_threadkey_t *key)
   {
  +#ifdef HAVE_PTHREAD_KEY_DELETE
       apr_status_t stat;
   
       if ((stat = pthread_key_delete(key->key)) == 0) {
  @@ -110,8 +110,10 @@
       }
   
       return stat;
  -}
  +#else
  +    return APR_ENOTIMPL;
   #endif
  +}
   
   APR_DECLARE(apr_status_t) apr_threadkey_data_get(void **data, const char *key,
                                                    apr_threadkey_t *threadkey)