Ticket #11035: boost_recursive_mutex.3.patch

File boost_recursive_mutex.3.patch, 1.9 KB (added by Cédric OCHS <kervala@…>, 8 years ago)

  • boost/config/posix_features.hpp 

    diff -r 9266b55758bb -r 7ec78a34de32 boost/config/posix_features.hpp
    a b  
    7777      // Likewise for the functions log1p and expm1.
    7878#     if defined(_XOPEN_VERSION) && (_XOPEN_VERSION+0 >= 500)
    7979#        define BOOST_HAS_GETTIMEOFDAY
    80 #        if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE+0 >= 500)
     80#        if (defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE+0 >= 500)) || defined(__ANDROID__)
    8181#           define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
    8282#        endif
    8383#        ifndef BOOST_HAS_LOG1P

  • boost/thread/pthread/mutex.hpp 

    diff -r 9266b55758bb -r 7ec78a34de32 boost/thread/pthread/mutex.hpp
    a b  
    2626#endif
    2727#include <boost/thread/detail/delete.hpp>
    2828
    29 #ifdef _POSIX_TIMEOUTS
    30 #if _POSIX_TIMEOUTS >= 0 && _POSIX_TIMEOUTS>=200112L
     29#if (defined(_POSIX_TIMEOUTS) && _POSIX_TIMEOUTS >= 0 && _POSIX_TIMEOUTS>=200112L) \
     30  || (defined(__ANDROID__) && __ANDROID_API__ >= 21)
    3131#ifndef BOOST_PTHREAD_HAS_TIMEDLOCK
    3232#define BOOST_PTHREAD_HAS_TIMEDLOCK
    3333#endif

  • boost/thread/pthread/recursive_mutex.hpp 

     #endif
-#endif
 
 
 #include <boost/config/abi_prefix.hpp>
diff -r 9266b55758bb -r 7ec78a34de32 boost/thread/pthread/recursive_mutex.hpp
    a b  
    2727#endif
    2828#include <boost/thread/detail/delete.hpp>
    2929
    30 #ifdef _POSIX_TIMEOUTS
    31 #if _POSIX_TIMEOUTS >= 0 && _POSIX_TIMEOUTS>=200112L
     30#if (defined(_POSIX_TIMEOUTS) && _POSIX_TIMEOUTS >= 0 && _POSIX_TIMEOUTS>=200112L) \
     31  || (defined(__ANDROID__) && __ANDROID_API__ >= 21)
    3232#ifndef BOOST_PTHREAD_HAS_TIMEDLOCK
    3333#define BOOST_PTHREAD_HAS_TIMEDLOCK
    3434#endif
    3535#endif
    36 #endif
    3736