Skip to content

L
libzmq
Commit 8a497e2f authored by Pieter Hintjens's avatar Pieter Hintjens
Browse files
Options

Resolved conflicts after merge

parents 0efb49f1 07b49ffb
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
include/zmq.h
View file @ 8a497e2f
......@@ -168,7 +168,6 @@ ZMQ_EXPORT int zmq_msg_close (zmq_msg_t *msg);
ZMQ_EXPORT int zmq_msg_move (zmq_msg_t *dest, zmq_msg_t *src);
ZMQ_EXPORT int zmq_msg_copy (zmq_msg_t *dest, zmq_msg_t *src);
ZMQ_EXPORT void *zmq_msg_data (zmq_msg_t *msg);
ZMQ_EXPORT ssize_t zmq_msg_size (zmq_msg_t *msg);
ZMQ_EXPORT int zmq_msg_more (zmq_msg_t *msg);
ZMQ_EXPORT int zmq_msg_get (zmq_msg_t *msg, int option, void *optval,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment