mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-04-06 00:00:03 +08:00
f65d76170b
git-subtree-dir: OpenVPN Adapter/Vendors/openvpn git-subtree-split: da99df69492256d7a18bbea303ae98457782a4bf
26 lines
901 B
Diff
26 lines
901 B
Diff
From 48f2e874280f0d93d1a3df2e48aacc9e13b8eef5 Mon Sep 17 00:00:00 2001
|
|
From: James Yonan <james@openvpn.net>
|
|
Date: Wed, 1 Mar 2017 13:45:38 -0700
|
|
Subject: Android appears to not support pthread_condattr_setclock
|
|
|
|
---
|
|
asio/include/asio/detail/impl/posix_event.ipp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/asio/include/asio/detail/impl/posix_event.ipp b/asio/include/asio/detail/impl/posix_event.ipp
|
|
index a62c434..c4b7982 100644
|
|
--- a/asio/include/asio/detail/impl/posix_event.ipp
|
|
+++ b/asio/include/asio/detail/impl/posix_event.ipp
|
|
@@ -31,7 +31,7 @@ namespace detail {
|
|
posix_event::posix_event()
|
|
: state_(0)
|
|
{
|
|
-#if (defined(__MACH__) && defined(__APPLE__))
|
|
+#if (defined(__MACH__) && defined(__APPLE__)) || defined(__ANDROID__)
|
|
int error = ::pthread_cond_init(&cond_, 0);
|
|
#else // (defined(__MACH__) && defined(__APPLE__))
|
|
::pthread_condattr_t attr;
|
|
--
|
|
2.7.4
|
|
|