mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-13 18:55:10 +01:00
Merge pull request #3267 from glemercier/master
Problem: Compilation with strict AARCH64 compilers is broken
This commit is contained in:
commit
501d0815bf
17
RELICENSE/glemercier.md
Normal file
17
RELICENSE/glemercier.md
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
|
||||||
|
|
||||||
|
This is a statement by Anton Dimitrov that grants permission to
|
||||||
|
relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
|
||||||
|
Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
|
||||||
|
approved license chosen by the current ZeroMQ BDFL (Benevolent
|
||||||
|
Dictator for Life).
|
||||||
|
|
||||||
|
A portion of the commits made by the Github handle "glemercier", with
|
||||||
|
commit author "Gregory Lemercier <greglemercier@free.fr>", are
|
||||||
|
copyright of Gregory Lmercier. This document hereby grants the libzmq
|
||||||
|
project team to relicense libzmq, including all past, present and
|
||||||
|
future contributions of the author listed above.
|
||||||
|
|
||||||
|
Gregory Lemercier
|
||||||
|
|
||||||
|
2018/10/07
|
@ -111,11 +111,13 @@ int zmq::v1_decoder_t::eight_byte_size_ready (unsigned char const *)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef __aarch64__
|
||||||
// Message size must fit within range of size_t data type.
|
// Message size must fit within range of size_t data type.
|
||||||
if (payload_length - 1 > std::numeric_limits<size_t>::max ()) {
|
if (payload_length - 1 > std::numeric_limits<size_t>::max ()) {
|
||||||
errno = EMSGSIZE;
|
errno = EMSGSIZE;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
const size_t msg_size = static_cast<size_t> (payload_length - 1);
|
const size_t msg_size = static_cast<size_t> (payload_length - 1);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user