src/cxx_supportlib/vendor-modified/boost/thread/detail/config.hpp in passenger-6.0.2 vs src/cxx_supportlib/vendor-modified/boost/thread/detail/config.hpp in passenger-6.0.3

@@ -9,10 +9,11 @@
 #define BOOST_THREAD_CONFIG_WEK01032003_HPP
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
 #include <boost/thread/detail/platform.hpp>
+#include <boost/thread/detail/thread_safety.hpp>
 
 //#define BOOST_THREAD_DONT_PROVIDE_INTERRUPTIONS
 // ATTRIBUTE_MAY_ALIAS
 
 //#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
@@ -415,9 +416,14 @@
 #if defined(BOOST_THREAD_CHRONO_WINDOWS_API)
   #define BOOST_THREAD_HAS_MONO_CLOCK
   #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO
 #elif defined(BOOST_THREAD_CHRONO_MAC_API)
   #define BOOST_THREAD_HAS_MONO_CLOCK
+#elif defined(__ANDROID__)
+  #define BOOST_THREAD_HAS_MONO_CLOCK
+  #if defined(__ANDROID_API__) && __ANDROID_API__ >= 21
+    #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO
+  #endif
 #else
   #include <time.h> // check for CLOCK_MONOTONIC
   #if defined(CLOCK_MONOTONIC)
     #define BOOST_THREAD_HAS_MONO_CLOCK
     #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO