From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 28 Feb 2008 07:36:04 +0000 (+0000)
Subject: Should compile again with linuxthreads header files.
X-Git-Tag: svn/VALGRIND_3_4_0~1014
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fcc16a5412521159a96e92d7003ff50c837a0f5;p=thirdparty%2Fvalgrind.git

Should compile again with linuxthreads header files.

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

diff --git a/exp-drd/drd_intercepts.c b/exp-drd/drd_intercepts.c
index bc0f3c763e..5ed7a5bc85 100644
--- a/exp-drd/drd_intercepts.c
+++ b/exp-drd/drd_intercepts.c
@@ -116,7 +116,17 @@ static MutexT pthread_to_drd_mutex_type(const int kind)
 
 static MutexT mutex_type(pthread_mutex_t* mutex)
 {
-   return pthread_to_drd_mutex_type(mutex->__data.__kind);
+#if defined(_PTHREAD_DESCR_DEFINED)
+   // Linuxthreads.
+   const int kind = mutex->__m_kind;
+#elif defined(__SIZEOF_PTHREAD_MUTEX_T)
+   // NPTL.
+   const int kind = mutex->__data.__kind;
+#else
+   // Another POSIX threads implementation. Regression tests will fail.
+   const int kind = PTHREAD_MUTEX_DEFAULT;
+#endif
+   return pthread_to_drd_mutex_type(kind);
 }
 
 static void vg_start_suppression(const void* const p, size_t const size)