Hi Mikael,
Your patch does not apply to the master:
sust...@istvan:~/zeromq2$ git apply
0001-Implement-maximum-message-size-and-a-socket-option-t.patch
0001-Implement-maximum-message-size-and-a-socket-option-t.patch:9:
trailing whitespace.
#define ZMQ_MAX_MSGSIZE 20
0001-Implement-maximum-message-size-and-a-socket-option-t.patch:23:
trailing whitespace.
zmq::decoder_t::decoder_t (size_t bufsize_, uint64_t max_msgsize_) :
0001-Implement-maximum-message-size-and-a-socket-option-t.patch:24:
trailing whitespace.
decoder_base_t <decoder_t> (bufsize_, max_msgsize_),
0001-Implement-maximum-message-size-and-a-socket-option-t.patch:33:
trailing whitespace.
if (!size && !under_maximum_size(size)) {
0001-Implement-maximum-message-size-and-a-socket-option-t.patch:45:
trailing whitespace.
#include "stdint.hpp"
error: patch failed: include/zmq.h:194
error: include/zmq.h: patch does not apply
error: patch failed: src/decoder.cpp:25
error: src/decoder.cpp: patch does not apply
error: patch failed: src/decoder.hpp:25
error: src/decoder.hpp: patch does not apply
error: patch failed: src/encoder.hpp:93
error: src/encoder.hpp: patch does not apply
error: patch failed: src/options.cpp:39
error: src/options.cpp: patch does not apply
error: patch failed: src/options.hpp:73
error: src/options.hpp: patch does not apply
error: patch failed: src/pgm_receiver.cpp:211
error: src/pgm_receiver.cpp: patch does not apply
error: patch failed: src/zmq_engine.cpp:35
error: src/zmq_engine.cpp: patch does not apply
Can you rebase your repo to match the master and send the patch once again?
Thanks.
Martin
_______________________________________________
zeromq-dev mailing list
zeromq-dev@lists.zeromq.org
http://lists.zeromq.org/mailman/listinfo/zeromq-dev
