Kouhei Sutou
null+****@clear*****
Thu Jul 11 21:26:21 JST 2013
Kouhei Sutou 2013-07-11 21:26:21 +0900 (Thu, 11 Jul 2013) New Revision: e41379f6ec8e60195ce9f26983915e922d2ddf2d https://github.com/groonga/groonga/commit/e41379f6ec8e60195ce9f26983915e922d2ddf2d Message: suggest: support zmq_msg_recv() in zmq >= 3 GitHub: refs #63 See also: http://www.zeromq.org/docs:3-1-upgrade Reported by Naoya Inada. Thanks!!! groonga_suggest_learner.c:377:41: note: each undeclared identifier is reported only once for each function it appears in groonga_suggest_learner.c: In function ‘recv_event_loop’: groonga_suggest_learner.c:468:9: error: too few arguments to function ‘zmq_recv’ if (zmq_recv(zmq_sock, &msg, 0)) { ^ In file included from groonga_suggest_learner.c:17:0: /usr/include/zmq.h:350:16: note: declared here ZMQ_EXPORT int zmq_recv (void *s, void *buf, size_t len, int flags); ^ Modified files: src/suggest/groonga_suggest_learner.c Modified: src/suggest/groonga_suggest_learner.c (+3 -1) =================================================================== --- src/suggest/groonga_suggest_learner.c 2013-07-11 21:25:06 +0900 (90dc4d4) +++ src/suggest/groonga_suggest_learner.c 2013-07-11 21:26:21 +0900 (2fe0fb0) @@ -33,6 +33,8 @@ #if ZMQ_VERSION_MAJOR == 2 # define zmq_msg_send(message, socket, flags) \ zmq_send((socket), (message), (flags)) +# define zmq_msg_recv(message, socket, flags) \ + zmq_recv((socket), (message), (flags)) #endif #define DEFAULT_RECV_ENDPOINT "tcp://*:1234" @@ -465,7 +467,7 @@ recv_event_loop(msgpack_zone *mempool, void *zmq_sock, grn_ctx *ctx) if (zmq_msg_init(&msg)) { print_error("cannot init zmq message."); } else { - if (zmq_recv(zmq_sock, &msg, 0)) { + if (zmq_msg_recv(&msg, zmq_sock, 0)) { print_error("cannot recv zmq message."); } else { msgpack_object obj; -------------- next part -------------- HTML����������������������������...Download