From cb211e4f1e031e44dbfdf68f133d1b638f6ca530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Schl=C3=BCter?= Date: Fri, 13 Sep 2019 13:26:44 +0900 Subject: [PATCH 1/2] Problem: inclusion of winsock2.h leads to ordering issues in user code. Solution: don't include winsock2.h, replace its only use (reference to SOCKET) by explicitly naming underlying type. --- include/zmq.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/zmq.h b/include/zmq.h index edf28efd..03be03c2 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -71,7 +71,6 @@ extern "C" { #error You need at least Windows XP target #endif #endif -#include #endif /* Handle DSO symbol visibility */ @@ -498,7 +497,12 @@ ZMQ_EXPORT int zmq_socket_monitor (void *s_, const char *addr_, int events_); /******************************************************************************/ #if defined _WIN32 -typedef SOCKET zmq_fd_t; +// Windows uses a pointer-sized unsigned integer to store the socket fd. +#if defined _WIN64 +typedef unsigned __int64 zmq_fd_t; +#else +typedef unsigned int zmq_fd_t; +#endif #else typedef int zmq_fd_t; #endif From 38d144731d4dca89accc2b3deaf388727340e21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Schl=C3=BCter?= Date: Fri, 13 Sep 2019 14:18:38 +0900 Subject: [PATCH 2/2] Add relicensing file --- RELICENSE/TobiSchluter.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 RELICENSE/TobiSchluter.md diff --git a/RELICENSE/TobiSchluter.md b/RELICENSE/TobiSchluter.md new file mode 100644 index 00000000..9b901922 --- /dev/null +++ b/RELICENSE/TobiSchluter.md @@ -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 Tobias Schlüter +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 "TobiSchluter", with +commit author "TobiSchluter", are copyright of Tobias Schlüter . +This document hereby grants the libzmq project team to relicense libzmq, +including all past, present and future contributions of the author listed above. + +Tobias Schlüter +2019/09/13