Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
L
libzmq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
libzmq
Commits
cfbeac6a
Commit
cfbeac6a
authored
Jan 21, 2016
by
Pieter Hintjens
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1722 from GreatFruitOmsk/master
Fix missing headers.
parents
55e8191a
e7850410
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
socket_base.cpp
src/socket_base.cpp
+5
-4
tcp_address.cpp
src/tcp_address.cpp
+1
-0
No files found.
src/socket_base.cpp
View file @
cfbeac6a
...
@@ -45,6 +45,7 @@
...
@@ -45,6 +45,7 @@
#endif
#endif
#else
#else
#include <unistd.h>
#include <unistd.h>
#include <ctype.h>
#endif
#endif
#include "socket_base.hpp"
#include "socket_base.hpp"
...
@@ -197,11 +198,11 @@ zmq::socket_base_t::socket_base_t (ctx_t *parent_, uint32_t tid_, int sid_, bool
...
@@ -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
()
zmq
::
socket_base_t
::~
socket_base_t
()
{
{
LIBZMQ_DELETE
(
mailbox
);
LIBZMQ_DELETE
(
mailbox
);
if
(
reaper_signaler
)
{
if
(
reaper_signaler
)
{
LIBZMQ_DELETE
(
reaper_signaler
);
LIBZMQ_DELETE
(
reaper_signaler
);
}
}
stop_monitor
();
stop_monitor
();
zmq_assert
(
destroyed
);
zmq_assert
(
destroyed
);
}
}
...
@@ -449,7 +450,7 @@ int zmq::socket_base_t::getsockopt (int option_, void *optval_,
...
@@ -449,7 +450,7 @@ int zmq::socket_base_t::getsockopt (int option_, void *optval_,
*
optvallen_
=
sizeof
(
int
);
*
optvallen_
=
sizeof
(
int
);
EXIT_MUTEX
();
EXIT_MUTEX
();
return
0
;
return
0
;
}
}
int
rc
=
options
.
getsockopt
(
option_
,
optval_
,
optvallen_
);
int
rc
=
options
.
getsockopt
(
option_
,
optval_
,
optvallen_
);
EXIT_MUTEX
();
EXIT_MUTEX
();
...
@@ -463,7 +464,7 @@ int zmq::socket_base_t::add_signaler(signaler_t *s_)
...
@@ -463,7 +464,7 @@ int zmq::socket_base_t::add_signaler(signaler_t *s_)
if
(
!
thread_safe
)
{
if
(
!
thread_safe
)
{
errno
=
EINVAL
;
errno
=
EINVAL
;
EXIT_MUTEX
();
EXIT_MUTEX
();
return
-
1
;
return
-
1
;
}
}
((
mailbox_safe_t
*
)
mailbox
)
->
add_signaler
(
s_
);
((
mailbox_safe_t
*
)
mailbox
)
->
add_signaler
(
s_
);
...
...
src/tcp_address.cpp
View file @
cfbeac6a
...
@@ -44,6 +44,7 @@
...
@@ -44,6 +44,7 @@
#include <arpa/inet.h>
#include <arpa/inet.h>
#include <netinet/tcp.h>
#include <netinet/tcp.h>
#include <netdb.h>
#include <netdb.h>
#include <ctype.h>
#endif
#endif
#ifdef ZMQ_HAVE_SOLARIS
#ifdef ZMQ_HAVE_SOLARIS
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment