From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 9 Feb 2014 09:10:14 +0000 (+0000)
Subject: drd: Make the code added in r13792 portable
X-Git-Tag: svn/VALGRIND_3_10_0~642
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74e8b94ed76fed0bf564e2ed02271bc729b64fb1;p=thirdparty%2Fvalgrind.git

drd: Make the code added in r13792 portable

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13794
---

diff --git a/drd/drd_pthread_intercepts.c b/drd/drd_pthread_intercepts.c
index 325ad60514..a2233d5e3d 100644
--- a/drd/drd_pthread_intercepts.c
+++ b/drd/drd_pthread_intercepts.c
@@ -249,7 +249,8 @@ static MutexT DRD_(pthread_to_drd_mutex_type)(int kind)
     * See also PTHREAD_MUTEX_KIND_MASK_NP in glibc source file
     * <nptl/pthreadP.h>.
     */
-   kind &= 3;
+   kind &= PTHREAD_MUTEX_RECURSIVE | PTHREAD_MUTEX_ERRORCHECK |
+      PTHREAD_MUTEX_NORMAL | PTHREAD_MUTEX_DEFAULT;
 
    if (kind == PTHREAD_MUTEX_RECURSIVE)
       return mutex_type_recursive_mutex;