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

Merge pull request #3681 from TobiSchluter/bugfix/dont_include_winsock2

Browse Source 
Bugfix/dont include winsock2
This commit is contained in:
Simon Giesecke 2019-09-13 09:34:16 +02:00 committed by GitHub
commit d76664017c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
RELICENSE/TobiSchluter.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 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

8
include/zmq.h
View File

@ -71,7 +71,6 @@ extern "C" {
#error You need at least Windows XP target #error You need at least Windows XP target
#endif #endif
#endif #endif
#include <winsock2.h>
#endif #endif
/* Handle DSO symbol visibility */ /* Handle DSO symbol visibility */
@ -498,7 +497,12 @@ ZMQ_EXPORT int zmq_socket_monitor (void *s_, const char *addr_, int events_);
/******************************************************************************/ /******************************************************************************/
#if defined _WIN32 #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 #else
typedef int zmq_fd_t; typedef int zmq_fd_t;
#endif #endif