diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2017-05-24 14:28:53 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2017-05-24 14:28:53 +0000 |
| commit | a4773251b68a1cd5ee711299bbb108bd8e9f025f (patch) | |
| tree | e2ce34605e6d82f17fc217ba3e9f974f49a93f87 /build | |
| parent | a173ba24fa493411bd08b62c962e92b3d38e2a27 (diff) | |
| download | libapr-a4773251b68a1cd5ee711299bbb108bd8e9f025f.tar.gz | |
Revert 1792956, 1792964, 1792962 (r1792961, r1792963 on trunk), was;
pthread_mutex_timedlock is broken on Solaris 10.
It can block without timeout in case of EDEADLK.
On Solaris 8 it does not exist, on Solaris 11
it is fixed. For Solaris 10 no patch is available.
Silence compiler warning "defined but not used"
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1796066 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/apr_hints.m4 | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/build/apr_hints.m4 b/build/apr_hints.m4 index fd3d33de0..549a2db22 100644 --- a/build/apr_hints.m4 +++ b/build/apr_hints.m4 @@ -237,11 +237,6 @@ dnl # Not a problem in 10.20. Otherwise, who knows? *-solaris2*) PLATOSVERS=`echo $host | sed 's/^.*solaris2.//'` APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT]) - if test $PLATOSVERS -eq 10; then - # pthread_mutex_timedlock is broken on Solaris 10. - # It can block without timeout in case of EDEADLK. - APR_SETIFNULL(ac_cv_func_pthread_mutex_timedlock, [no]) - fi if test $PLATOSVERS -ge 10; then APR_SETIFNULL(apr_lock_method, [USE_PROC_PTHREAD_SERIALIZE]) else |