3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-10 16:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3600 from drbitboy/master

Browse Source 
Problem:  include/zmq.h is not so much broken as inconsistent in
This commit is contained in:
Luca Boccassi 2019-07-27 11:38:57 +01:00 committed by GitHub
commit 47fc979b2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
RELICENSE/latchmoor-services-carcich.md Normal file
View File

@ -0,0 +1,16 @@
# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
This is a statement by Latchmoor Services, LLC
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 "drbitboy", with
commit author "Brian Carcich <drbitboy@gmail.com>", are copyright of Latchmoor
Services, LLC.
This document hereby grants the libzmq project team to relicense libzmq,
including all past, present and future contributions of the author listed above.
Latchmoor Services, LLC
2019/07/26

21
include/zmq.h
View File

@ -493,6 +493,15 @@ zmq_send_const (void *s_, const void *buf_, size_t len_, int flags_);
ZMQ_EXPORT int zmq_recv (void *s_, void *buf_, size_t len_, int flags_); ZMQ_EXPORT int zmq_recv (void *s_, void *buf_, size_t len_, int flags_);
ZMQ_EXPORT int zmq_socket_monitor (void *s_, const char *addr_, int events_); ZMQ_EXPORT int zmq_socket_monitor (void *s_, const char *addr_, int events_);
/******************************************************************************/
/* Hide socket fd type; this was before zmq_poller_event_t typedef below */
/******************************************************************************/
#if defined _WIN32
typedef SOCKET zmq_fd_t;
#else
typedef int zmq_fd_t;
#endif
/******************************************************************************/ /******************************************************************************/
/* Deprecated I/O multiplexing. Prefer using zmq_poller API */ /* Deprecated I/O multiplexing. Prefer using zmq_poller API */
@ -506,11 +515,7 @@ ZMQ_EXPORT int zmq_socket_monitor (void *s_, const char *addr_, int events_);
typedef struct zmq_pollitem_t typedef struct zmq_pollitem_t
{ {
void *socket; void *socket;
#if defined _WIN32 zmq_fd_t fd;
SOCKET fd;
#else
int fd;
#endif
short events; short events;
short revents; short revents;
} zmq_pollitem_t; } zmq_pollitem_t;
@ -691,12 +696,6 @@ ZMQ_EXPORT const char *zmq_msg_group (zmq_msg_t *msg);
#define ZMQ_HAVE_POLLER #define ZMQ_HAVE_POLLER
#if defined _WIN32
typedef SOCKET zmq_fd_t;
#else
typedef int zmq_fd_t;
#endif
typedef struct zmq_poller_event_t typedef struct zmq_poller_event_t
{ {
void *socket; void *socket;