generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-06 00:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4540 from keith-dev/master

Browse Source 
Support clang-16 on Termux
This commit is contained in:
Luca Boccassi 2023-04-19 11:57:08 +01:00 committed by GitHub
commit be8af6f128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
RELICENSE/keith-dev.md Normal file
View File

@ -0,0 +1,15 @@
# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
This is a statement by Keith Williams
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 "keith-dev", with
commit author "Keith Williams <keith.dev.uk@gmail.com>", are copyright of Keith Williams.
This document hereby grants the libzmq project team to relicense libzmq,
including all past, present and future contributions of the author listed above.
Keith Williams
2023/04/19

3
builds/cmake/Modules/ZMQSourceRunChecks.cmake
View File

@ -194,13 +194,14 @@ macro(zmq_check_tcp_tipc)
int main(int argc, char *argv []) int main(int argc, char *argv [])
{ {
struct sockaddr_tipc topsrv; struct sockaddr_tipc topsrv;
int sd = socket(AF_TIPC, SOCK_SEQPACKET, 0); int sd = socket(PF_TIPC, SOCK_SEQPACKET, 0);
memset(&topsrv, 0, sizeof(topsrv)); memset(&topsrv, 0, sizeof(topsrv));
topsrv.family = AF_TIPC; topsrv.family = AF_TIPC;
topsrv.addrtype = TIPC_ADDR_NAME; topsrv.addrtype = TIPC_ADDR_NAME;
topsrv.addr.name.name.type = TIPC_TOP_SRV; topsrv.addr.name.name.type = TIPC_TOP_SRV;
topsrv.addr.name.name.instance = TIPC_TOP_SRV; topsrv.addr.name.name.instance = TIPC_TOP_SRV;
fcntl(sd, F_SETFL, O_NONBLOCK); fcntl(sd, F_SETFL, O_NONBLOCK);
tipc_addr(0, 0, 0);
} }
" "
ZMQ_HAVE_TIPC) ZMQ_HAVE_TIPC)

2
tests/test_wss_transport.cpp
View File

@ -124,7 +124,7 @@ const char *cert =
void test_roundtrip () void test_roundtrip ()
{ {
char connect_address[MAX_SOCKET_STRING + strlen ("/roundtrip")]; char connect_address[MAX_SOCKET_STRING + sizeof ("/roundtrip") - 1];
size_t addr_length = sizeof (connect_address); size_t addr_length = sizeof (connect_address);
void *sb = test_context_socket (ZMQ_REP); void *sb = test_context_socket (ZMQ_REP);
zmq_setsockopt (sb, ZMQ_WSS_CERT_PEM, cert, strlen (cert)); zmq_setsockopt (sb, ZMQ_WSS_CERT_PEM, cert, strlen (cert));