Merge remote branch 'jonochang/master' into zdevice

Conflicts: version.txt
bmabey · Mar 14, 2011 · 4847a3b · 4847a3b
2 parents 35182d4 + 8304d0f
commit 4847a3b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/lib/ffi-rzmq/wrapper.rb b/lib/ffi-rzmq/wrapper.rb
@@ -78,6 +78,9 @@ class Msg < FFI::Struct
   attach_function :zmq_recv, [:pointer, :pointer, :int], :int
   attach_function :zmq_close, [:pointer], :int
 
+  #experimental zmq_devices support
+  attach_function :zmq_device, [:int, :pointer, :pointer], :int
+
   # Poll api
   @blocking = true
   attach_function :zmq_poll, [:pointer, :int, :long], :int

diff --git a/lib/ffi-rzmq/zmq.rb b/lib/ffi-rzmq/zmq.rb
@@ -63,6 +63,11 @@ module ZMQ
   ENODEV = Errno::ENODEV::Errno
   EFAULT = Errno::EFAULT::Errno
 
+  #  Device Types
+  STREAMER = 1
+  FORWARDER = 2
+  QUEUE = 3
+
   # ZMQ errors
   HAUSNUMERO     = 156384712
   EMTHREAD       = (HAUSNUMERO + 50)