From: Davin McCall <davmac@davmac.org>
Date: Thu, 23 May 2019 10:39:28 +0000 (+1000)
Subject: Update bundled Dasynq to latest (1.1.6).
X-Git-Tag: v0.5.1~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cc7723ce316621693b61b93f7e2c824fe51f89fc;p=oweals%2Fdinit.git

Update bundled Dasynq to latest (1.1.6).

Fixes critical issue on OpenBSD.
---

diff --git a/src/dasynq/dasynq-itimer.h b/src/dasynq/dasynq-itimer.h
index b004e95..a52166e 100644
--- a/src/dasynq/dasynq-itimer.h
+++ b/src/dasynq/dasynq-itimer.h
@@ -275,7 +275,7 @@ class itimer_events : public timer_base<Base>
         if (timer_queue.is_queued(timer_id)) {
             bool was_first = (&timer_queue.get_root()) == &timer_id;
             timer_queue.remove(timer_id);
-            if (was_first) {
+            if (was_first && provide_mono_timer) {
                 set_timer_from_queue();
             }
         }
diff --git a/src/dasynq/dasynq-signal.h b/src/dasynq/dasynq-signal.h
index 7a9ddd4..612419c 100644
--- a/src/dasynq/dasynq-signal.h
+++ b/src/dasynq/dasynq-signal.h
@@ -5,6 +5,7 @@
 
 #include <signal.h>
 #include <setjmp.h>
+#include <sys/types.h>
 
 // Support for the standard POSIX signal mechanisms. This can be used by backends that don't
 // otherwise support receiving signals. It is not particularly nice (it involves using longjmp
@@ -99,7 +100,7 @@ inline siginfo_t * get_siginfo()
     return &sig_capture::siginfo_cap;
 }
 
-} } // namespace dasynq :: signal_mech
+} } // namespace dprivate :: signal_mech
 
 // signal_events template.
 //
diff --git a/src/dasynq/dasynq-stableheap.h b/src/dasynq/dasynq-stableheap.h
index a93ae79..af4ea7b 100644
--- a/src/dasynq/dasynq-stableheap.h
+++ b/src/dasynq/dasynq-stableheap.h
@@ -73,7 +73,7 @@ class stable_heap : private H<T,stable_prio<P>,compare_stable_prio<P,C>>
 
     template <typename ...U> void allocate(handle_t & hnd, U&& ...u)
     {
-        return Base::allocate(hnd, u...);
+        Base::allocate(hnd, u...);
     }
 
     static void init_handle(handle_t &hndl)