You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2016/03/05 13:15:03 UTC
svn commit: r1733708 - /apr/apr/trunk/locks/unix/proc_mutex.c
Author: ylavic
Date: Sat Mar 5 12:15:02 2016
New Revision: 1733708
URL: http://svn.apache.org/viewvc?rev=1733708&view=rev
Log:
apr_proc_mutex-pthread: follow up to r1733694.
Simplify #if/#else/#endif logic, no functional change.
Modified:
apr/apr/trunk/locks/unix/proc_mutex.c
Modified: apr/apr/trunk/locks/unix/proc_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/locks/unix/proc_mutex.c?rev=1733708&r1=1733707&r2=1733708&view=diff
==============================================================================
--- apr/apr/trunk/locks/unix/proc_mutex.c (original)
+++ apr/apr/trunk/locks/unix/proc_mutex.c Sat Mar 5 12:15:02 2016
@@ -590,10 +590,8 @@ static apr_status_t proc_mutex_proc_pthr
pthread_mutex_consistent_np(mutex->pthread_interproc);
}
else
- return rv;
-#else
- return rv;
#endif
+ return rv;
}
mutex->curr_locked = 1;
return APR_SUCCESS;
@@ -615,13 +613,10 @@ static apr_status_t proc_mutex_proc_pthr
if (rv == EOWNERDEAD) {
apr_atomic_dec32(&proc_pthread_mutex_refcount(mutex));
pthread_mutex_consistent_np(mutex->pthread_interproc);
- rv = APR_SUCCESS;
}
else
- return rv;
-#else
- return rv;
#endif
+ return rv;
}
mutex->curr_locked = 1;
return APR_SUCCESS;
@@ -658,13 +653,10 @@ proc_mutex_proc_pthread_timedacquire(apr
if (rv == EOWNERDEAD) {
apr_atomic_dec32(&proc_pthread_mutex_refcount(mutex));
pthread_mutex_consistent_np(mutex->pthread_interproc);
- rv = APR_SUCCESS;
}
else
- return rv;
-#else
- return rv;
#endif
+ return rv;
}
}
mutex->curr_locked = 1;