3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-30 01:06:55 +08:00
Code Issues Projects Releases Wiki Activity

Problem: unnecessary ifdefs regarding handling of int vs. SOCKET at various places

Browse Source 
Solution: use a typedef instead
This commit is contained in:
Simon Giesecke 2018-05-14 14:29:49 +02:00
parent e8877f78a9
commit bf6bde3ae3
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/fd.hpp
View File

@ -38,6 +38,9 @@ namespace zmq
{ {
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
#if defined _MSC_VER && _MSC_VER <= 1400 #if defined _MSC_VER && _MSC_VER <= 1400
///< \todo zmq.h uses SOCKET unconditionally, so probably VS versions before
/// VS2008 are unsupported anyway. Apart from that, this seems to depend on
/// the Windows SDK version rather than the VS version.
typedef UINT_PTR fd_t; typedef UINT_PTR fd_t;
enum enum
{ {

27
src/zmq.cpp
View File

@ -1219,13 +1219,8 @@ static int check_poller_registration_args (void *const poller_, void *const s_)
return 0; return 0;
} }
#if defined _WIN32
static int check_poller_fd_registration_args (void *const poller_, static int check_poller_fd_registration_args (void *const poller_,
const SOCKET fd_) const zmq::fd_t fd_)
#else
static int check_poller_fd_registration_args (void *const poller_,
const int fd_)
#endif
{ {
if (-1 == check_poller (poller_)) if (-1 == check_poller (poller_))
return -1; return -1;
@ -1250,14 +1245,10 @@ int zmq_poller_add (void *poller_, void *s_, void *user_data_, short events_)
->add (socket, user_data_, events_); ->add (socket, user_data_, events_);
} }
#if defined _WIN32
int zmq_poller_add_fd (void *poller_, int zmq_poller_add_fd (void *poller_,
SOCKET fd_, zmq::fd_t fd_,
void *user_data_, void *user_data_,
short events_) short events_)
#else
int zmq_poller_add_fd (void *poller_, int fd_, void *user_data_, short events_)
#endif
{ {
if (-1 == check_poller_fd_registration_args (poller_, fd_) if (-1 == check_poller_fd_registration_args (poller_, fd_)
|| -1 == check_events (events_)) || -1 == check_events (events_))
@ -1279,12 +1270,7 @@ int zmq_poller_modify (void *poller_, void *s_, short events_)
return ((zmq::socket_poller_t *) poller_)->modify (socket, events_); return ((zmq::socket_poller_t *) poller_)->modify (socket, events_);
} }
int zmq_poller_modify_fd (void *poller_, zmq::fd_t fd_, short events_)
#if defined _WIN32
int zmq_poller_modify_fd (void *poller_, SOCKET fd_, short events_)
#else
int zmq_poller_modify_fd (void *poller_, int fd_, short events_)
#endif
{ {
if (-1 == check_poller_fd_registration_args (poller_, fd_) if (-1 == check_poller_fd_registration_args (poller_, fd_)
|| -1 == check_events (events_)) || -1 == check_events (events_))
@ -1293,7 +1279,6 @@ int zmq_poller_modify_fd (void *poller_, int fd_, short events_)
return ((zmq::socket_poller_t *) poller_)->modify_fd (fd_, events_); return ((zmq::socket_poller_t *) poller_)->modify_fd (fd_, events_);
} }
int zmq_poller_remove (void *poller_, void *s_) int zmq_poller_remove (void *poller_, void *s_)
{ {
if (-1 == check_poller_registration_args (poller_, s_)) if (-1 == check_poller_registration_args (poller_, s_))
@ -1304,11 +1289,7 @@ int zmq_poller_remove (void *poller_, void *s_)
return ((zmq::socket_poller_t *) poller_)->remove (socket); return ((zmq::socket_poller_t *) poller_)->remove (socket);
} }
#if defined _WIN32 int zmq_poller_remove_fd (void *poller_, zmq::fd_t fd_)
int zmq_poller_remove_fd (void *poller_, SOCKET fd_)
#else
int zmq_poller_remove_fd (void *poller_, int fd_)
#endif
{ {
if (-1 == check_poller_fd_registration_args (poller_, fd_)) if (-1 == check_poller_fd_registration_args (poller_, fd_))
return -1; return -1;