From ad3c87ee42b33d71902257601fc4a0c5fa4bb569 Mon Sep 17 00:00:00 2001
From: Davin McCall <davmac@davmac.org>
Date: Tue, 16 Jan 2018 20:34:06 +0000
Subject: [PATCH] Update bundled Dasynq to 1.0.4.

---
 src/dasynq/dasynq-basewatchers.h | 3 +++
 src/dasynq/dasynq-timerbase.h    | 2 +-
 src/dasynq/dasynq.h              | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/dasynq/dasynq-basewatchers.h b/src/dasynq/dasynq-basewatchers.h
index a83af71..67144fb 100644
--- a/src/dasynq/dasynq-basewatchers.h
+++ b/src/dasynq/dasynq-basewatchers.h
@@ -181,7 +181,10 @@ namespace dprivate {
         template <typename, typename, typename> friend class event_dispatch;
         template <typename, typename> friend class dasynq::event_loop;
 
+        base_bidi_fd_watcher(const base_bidi_fd_watcher &) = delete;
+
         protected:
+        base_bidi_fd_watcher() noexcept { }
 
         // The main instance is the "input" watcher only; we keep a secondary watcher with a secondary set
         // of flags for the "output" watcher. Note that some of the flags in the secondary watcher aren't
diff --git a/src/dasynq/dasynq-timerbase.h b/src/dasynq/dasynq-timerbase.h
index 41b02fb..96cc518 100644
--- a/src/dasynq/dasynq-timerbase.h
+++ b/src/dasynq/dasynq-timerbase.h
@@ -59,7 +59,7 @@ inline time_val operator-(const time_val &t1, const time_val &t2) noexcept
 {
     time_val diff;
     diff.seconds() = t1.seconds() - t2.seconds();
-    if (t1.nseconds() > t2.nseconds()) {
+    if (t1.nseconds() >= t2.nseconds()) {
         diff.nseconds() = t1.nseconds() - t2.nseconds();
     }
     else {
diff --git a/src/dasynq/dasynq.h b/src/dasynq/dasynq.h
index 7150f21..08439b8 100644
--- a/src/dasynq/dasynq.h
+++ b/src/dasynq/dasynq.h
@@ -1880,15 +1880,16 @@ class child_proc_watcher : private dprivate::base_child_watcher<typename EventLo
             
             if (child == 0) {
                 // I am the child
+                close(pipefds[1]);
                 
                 // Wait for message from parent before continuing:
                 int rr;
                 int r = read(pipefds[0], &rr, sizeof(rr));
                 while (r == -1 && errno == EINTR) {
-                    read(pipefds[0], &rr, sizeof(rr));
+                    r = read(pipefds[0], &rr, sizeof(rr));
                 }
                 
-                if (r == -1) _exit(0);
+                if (r <= 0) _exit(0);
                 
                 close(pipefds[0]);
                 return 0;
-- 
2.25.1