diff options
| author | jim <jim@13f79535-47bb-0310-9956-ffa450edef68> | 2002-03-06 13:05:11 +0000 |
|---|---|---|
| committer | jim <jim@13f79535-47bb-0310-9956-ffa450edef68> | 2002-03-06 13:05:11 +0000 |
| commit | 779984c664f44262df82072f13545fb81beea825 (patch) | |
| tree | 3eaeae49ffb9aaed1d7dfcd2bc62f2b84a5bd811 /locks | |
| parent | f38e181a0314d83dd4b4db7e1db0e1d08a61ccfc (diff) | |
| download | libapr-779984c664f44262df82072f13545fb81beea825.tar.gz | |
These are redundant redundancies. We already wrap the whole file
with APR_HAS_THREADS.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63089 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks')
| -rw-r--r-- | locks/unix/thread_mutex.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/locks/unix/thread_mutex.c b/locks/unix/thread_mutex.c index 7db03a2a9..ff7d44142 100644 --- a/locks/unix/thread_mutex.c +++ b/locks/unix/thread_mutex.c @@ -127,7 +127,6 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_lock(apr_thread_mutex_t *mutex) { 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 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_lock(apr_thread_mutex_t *mutex) mutex->owner_ref = 1; } else { -#endif rv = pthread_mutex_lock(&mutex->mutex); if (rv) { #ifdef PTHREAD_SETS_ERRNO @@ -155,9 +153,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_lock(apr_thread_mutex_t *mutex) return rv; } -#if APR_HAS_THREADS } -#endif return rv; } @@ -166,7 +162,6 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex) { 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 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex) mutex->owner_ref = 1; } else { -#endif rv = pthread_mutex_trylock(&mutex->mutex); if (rv) { #ifdef PTHREAD_SETS_ERRNO @@ -193,9 +187,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex) #endif return (rv == EBUSY) ? APR_EBUSY : rv; } -#if APR_HAS_THREADS } -#endif return rv; } @@ -204,7 +196,6 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_unlock(apr_thread_mutex_t *mutex) { 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 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_unlock(apr_thread_mutex_t *mutex) mutex->owner_ref = 0; } else { -#endif status = pthread_mutex_unlock(&mutex->mutex); if (status) { #ifdef PTHREAD_SETS_ERRNO @@ -231,9 +221,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_unlock(apr_thread_mutex_t *mutex) #endif return status; } -#if APR_HAS_THREADS } -#endif return status; } |