apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject cvs commit: apr/locks/unix thread_mutex.c
Date Wed, 06 Mar 2002 13:05:11 GMT
jim         02/03/06 05:05:11

  Modified:    locks/unix thread_mutex.c
  Log:
  These are redundant redundancies. We already wrap the whole file
  with APR_HAS_THREADS.
  
  Revision  Changes    Path
  1.8       +0 -12     apr/locks/unix/thread_mutex.c
  
  Index: thread_mutex.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/unix/thread_mutex.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- thread_mutex.c	11 Jan 2002 15:04:34 -0000	1.7
  +++ thread_mutex.c	6 Mar 2002 13:05:11 -0000	1.8
  @@ -127,7 +127,6 @@
   {
       apr_status_t rv;
   
  -#if APR_HAS_THREADS
       if (mutex->nested) {
           if (apr_os_thread_equal(mutex->owner, apr_os_thread_current())) {
               mutex->owner_ref++;
  @@ -146,7 +145,6 @@
           mutex->owner_ref = 1;
       }
       else {
  -#endif
           rv = pthread_mutex_lock(&mutex->mutex);
           if (rv) {
   #ifdef PTHREAD_SETS_ERRNO
  @@ -155,9 +153,7 @@
               return rv;
           }
   
  -#if APR_HAS_THREADS
       }
  -#endif
   
       return rv;
   }
  @@ -166,7 +162,6 @@
   {
       apr_status_t rv;
   
  -#if APR_HAS_THREADS
       if (mutex->nested) {
           if (apr_os_thread_equal(mutex->owner, apr_os_thread_current())) {
               mutex->owner_ref++;
  @@ -185,7 +180,6 @@
           mutex->owner_ref = 1;
       }
       else {
  -#endif
           rv = pthread_mutex_trylock(&mutex->mutex);
           if (rv) {
   #ifdef PTHREAD_SETS_ERRNO
  @@ -193,9 +187,7 @@
   #endif
               return (rv == EBUSY) ? APR_EBUSY : rv;
           }
  -#if APR_HAS_THREADS
       }
  -#endif
   
       return rv;
   }
  @@ -204,7 +196,6 @@
   {
       apr_status_t status;
   
  -#if APR_HAS_THREADS
       if (mutex->nested) {
           if (apr_os_thread_equal(mutex->owner, apr_os_thread_current())) {
               mutex->owner_ref--;
  @@ -223,7 +214,6 @@
           mutex->owner_ref = 0;
       }
       else {
  -#endif
           status = pthread_mutex_unlock(&mutex->mutex);
           if (status) {
   #ifdef PTHREAD_SETS_ERRNO
  @@ -231,9 +221,7 @@
   #endif
               return status;
           }
  -#if APR_HAS_THREADS
       }
  -#endif
       return status;
   }
   
  
  
  

Mime
View raw message