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

Merge pull request #1722 from GreatFruitOmsk/master

Browse Source 
Fix missing headers.
This commit is contained in:
Pieter Hintjens 2016-01-21 08:46:14 +01:00
commit cfbeac6ad1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/socket_base.cpp
View File

@ -45,6 +45,7 @@
#endif
#else
#include <unistd.h>
#include <ctype.h>
#endif
#include "socket_base.hpp"
@ -197,11 +198,11 @@ zmq::socket_base_t::socket_base_t (ctx_t *parent_, uint32_t tid_, int sid_, bool
zmq::socket_base_t::~socket_base_t ()
{
LIBZMQ_DELETE(mailbox);
if (reaper_signaler) {
LIBZMQ_DELETE(reaper_signaler);
}
stop_monitor ();
zmq_assert (destroyed);
}
@ -449,7 +450,7 @@ int zmq::socket_base_t::getsockopt (int option_, void *optval_,
*optvallen_ = sizeof (int);
EXIT_MUTEX ();
return 0;
}
}
int rc = options.getsockopt (option_, optval_, optvallen_);
EXIT_MUTEX ();
@ -463,7 +464,7 @@ int zmq::socket_base_t::add_signaler(signaler_t *s_)
if (!thread_safe) {
errno = EINVAL;
EXIT_MUTEX ();
return -1;
return -1;
}
((mailbox_safe_t*)mailbox)->add_signaler(s_);

1
src/tcp_address.cpp
View File

@ -44,6 +44,7 @@
#include <arpa/inet.h>
#include <netinet/tcp.h>
#include <netdb.h>
#include <ctype.h>
#endif
#ifdef ZMQ_HAVE_SOLARIS