|
From: <sv...@va...> - 2008-10-13 19:22:46
|
Author: bart
Date: 2008-10-13 20:22:35 +0100 (Mon, 13 Oct 2008)
New Revision: 8670
Log:
Replaced test for FILE::_lock by a more direct test.
Modified:
trunk/configure.in
trunk/drd/drd_pthread_intercepts.c
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-10-13 04:19:15 UTC (rev 8669)
+++ trunk/configure.in 2008-10-13 19:22:35 UTC (rev 8670)
@@ -708,6 +708,26 @@
])
+# Check whether FILE has a member called _lock and whether it's a pointer.
+
+AC_MSG_CHECKING([for FILE::_lock])
+
+AC_TRY_COMPILE(
+[
+ #include <stdio.h>
+], [
+ void *p;
+ p = stdout->_lock;
+ return 0;
+], [
+AC_MSG_RESULT([yes])
+AC_DEFINE([HAVE_LIBC_FILE_LOCK], 1,
+ [Define to 1 if FILE has a member called _lock.])
+], [
+AC_MSG_RESULT([no])
+])
+
+
# Check whether pthread_mutex_t has a member called __m_kind.
AC_MSG_CHECKING([for pthread_mutex_t::__m_kind])
@@ -1261,7 +1281,6 @@
AC_CHECK_HEADERS([ \
endian.h \
mqueue.h \
- bits/libc-lock.h \
sys/endian.h \
sys/epoll.h \
sys/eventfd.h \
Modified: trunk/drd/drd_pthread_intercepts.c
===================================================================
--- trunk/drd/drd_pthread_intercepts.c 2008-10-13 04:19:15 UTC (rev 8669)
+++ trunk/drd/drd_pthread_intercepts.c 2008-10-13 19:22:35 UTC (rev 8670)
@@ -103,7 +103,7 @@
/* more than one thread. Suppress data race reports on these objects. */
DRD_IGNORE_VAR(*stdout);
DRD_IGNORE_VAR(*stderr);
-#if defined(HAVE_BITS_LIBC_LOCK_H)
+#if defined(HAVE_LIBC_FILE_LOCK)
DRD_IGNORE_VAR(*(pthread_mutex_t*)(stdout->_lock));
DRD_IGNORE_VAR(*(pthread_mutex_t*)(stderr->_lock));
#endif
|