diff options
| -rw-r--r-- | src/msg.cpp | 2 | ||||
| -rw-r--r-- | src/msg.hpp | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/msg.cpp b/src/msg.cpp index fa871db..f88a902 100644 --- a/src/msg.cpp +++ b/src/msg.cpp @@ -68,7 +68,7 @@ int zmq::msg_t::init_size (size_t size_) return 0; } -int zmq::msg_t::init_data (void *data_, size_t size_, zmq_free_fn *ffn_, +int zmq::msg_t::init_data (void *data_, size_t size_, msg_free_fn *ffn_, void *hint_) { u.lmsg.type = type_lmsg; diff --git a/src/msg.hpp b/src/msg.hpp index b7d21f6..466a96a 100644 --- a/src/msg.hpp +++ b/src/msg.hpp @@ -26,6 +26,14 @@ #include "config.hpp" #include "atomic_counter.hpp" +// Signature for free function to deallocate the message content. +// Note that it has to be declared as "C" so that it is the same as +// zmq_free_fn defined in zmq.h. +extern "C" +{ + typedef void (msg_free_fn) (void *data, void *hint); +} + namespace zmq { @@ -43,13 +51,10 @@ namespace zmq shared = 128 }; - // Signature for free function to deallocate the message content. - typedef void (free_fn_t) (void *data, void *hint); - bool check (); int init (); int init_size (size_t size_); - int init_data (void *data_, size_t size_, free_fn_t *ffn_, + int init_data (void *data_, size_t size_, msg_free_fn *ffn_, void *hint_); int init_delimiter (); int close (); @@ -82,7 +87,7 @@ namespace zmq { void *data; size_t size; - free_fn_t *ffn; + msg_free_fn *ffn; void *hint; zmq::atomic_counter_t refcnt; }; |