generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-12 18:40:27 +01:00
Code Issues Projects Releases Wiki Activity

Problem: inclusion of winsock2.h leads to ordering issues in user code.

Browse Source 
Solution: don't include winsock2.h, replace its only use (reference to SOCKET) by explicitly naming underlying type.
This commit is contained in:
Tobias Schlüter 2019-09-13 13:26:44 +09:00
parent 3ecaf9fe6e
commit cb211e4f1e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/zmq.h
View File

@ -71,7 +71,6 @@ extern "C" {
#error You need at least Windows XP target
#endif
#endif
#include <winsock2.h>
#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