mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-04-24 00:00:05 +08:00
Squashed 'OpenVPN Adapter/Vendors/openvpn/' content from commit da99df6
git-subtree-dir: OpenVPN Adapter/Vendors/openvpn git-subtree-split: da99df69492256d7a18bbea303ae98457782a4bf
This commit is contained in:
+25
@@ -0,0 +1,25 @@
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user