Subject: [Boost-commit] svn:boost r83948 - trunk/boost/thread/pthread
From: vicente.botet_at_[hidden]
Date: 2013-04-18 02:41:44
Author: viboes
Date: 2013-04-18 02:41:42 EDT (Thu, 18 Apr 2013)
New Revision: 83948
URL: http://svn.boost.org/trac/boost/changeset/83948
Log:
Thread: make unnifor definition of BOOST_PTHREAD_HAS_TIMEDLOCK #8443.
Text files modified:
trunk/boost/thread/pthread/mutex.hpp | 2 ++
trunk/boost/thread/pthread/recursive_mutex.hpp | 5 ++++-
2 files changed, 6 insertions(+), 1 deletions(-)
Modified: trunk/boost/thread/pthread/mutex.hpp
==============================================================================
--- trunk/boost/thread/pthread/mutex.hpp (original)
+++ trunk/boost/thread/pthread/mutex.hpp 2013-04-18 02:41:42 EDT (Thu, 18 Apr 2013)
@@ -27,9 +27,11 @@
#ifdef _POSIX_TIMEOUTS
#if _POSIX_TIMEOUTS >= 0 && _POSIX_C_SOURCE>=200112L
+#ifndef BOOST_PTHREAD_HAS_TIMEDLOCK
#define BOOST_PTHREAD_HAS_TIMEDLOCK
#endif
#endif
+#endif
#include <boost/config/abi_prefix.hpp>
Modified: trunk/boost/thread/pthread/recursive_mutex.hpp
==============================================================================
--- trunk/boost/thread/pthread/recursive_mutex.hpp (original)
+++ trunk/boost/thread/pthread/recursive_mutex.hpp 2013-04-18 02:41:42 EDT (Thu, 18 Apr 2013)
@@ -28,10 +28,13 @@
#include <boost/thread/detail/delete.hpp>
#ifdef _POSIX_TIMEOUTS
-#if _POSIX_TIMEOUTS >= 0
+#if _POSIX_TIMEOUTS >= 0 && _POSIX_C_SOURCE>=200112L
+#ifndef BOOST_PTHREAD_HAS_TIMEDLOCK
#define BOOST_PTHREAD_HAS_TIMEDLOCK
#endif
#endif
+#endif
+
#if defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE) && defined(BOOST_PTHREAD_HAS_TIMEDLOCK)
#define BOOST_USE_PTHREAD_RECURSIVE_TIMEDLOCK