From 56619463ac26dc6c3e576d2fbf6b544eebeb5148 Mon Sep 17 00:00:00 2001
From: Martin Lucina <martin@lucina.net>
Date: Sun, 20 May 2012 11:24:59 +0200
Subject: Imported Upstream version 2.2.0

---
 src/options.hpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/options.hpp')

diff --git a/src/options.hpp b/src/options.hpp
index b2e29d0..537ea06 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -80,6 +80,10 @@ namespace zmq
         //  is not aware of the peer's identity, however, it is able to send
         //  messages straight away.
         bool immediate_connect;
+
+        // The timeout for send/recv operations for this socket.
+        int rcvtimeo;
+        int sndtimeo;
     };
 
 }
-- 
cgit v1.2.3