Patches from sub-forward branch incorporated

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/src/command.hpp b/src/command.hpp
index ff7b551..15cee0a 100644
--- a/src/command.hpp
+++ b/src/command.hpp
@@ -42,6 +42,7 @@ namespace zmq
             bind,
             activate_read,
             activate_write,
+            hiccup,
             pipe_term,
             pipe_term_ack,
             term_req,
@@ -95,6 +96,13 @@ namespace zmq
                 uint64_t msgs_read;
             } activate_write;
 
+            //  Sent by pipe reader to writer after creating a new inpipe.
+            //  The parameter is actually of type pipe_t::upipe_t, however,
+            //  its definition is private so we'll have to do with void*.
+            struct {
+                void *pipe;
+            } hiccup;
+
             //  Sent by pipe reader to pipe writer to ask it to terminate
             //  its end of the pipe.
             struct {