generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-23 15:14:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #936 from soundart/master

Browse Source 
cmake: fix test_fork,  fix fragile code related to HAVE_FORK macro
This commit is contained in:
Richard Newton 2014-03-18 22:08:33 +00:00
commit 65dcd79047
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/cmake/platform.hpp.in
View File

@ -10,7 +10,7 @@
#cmakedefine ZMQ_FORCE_MUTEXES
#cmakedefine01 HAVE_FORK
#cmakedefine HAVE_FORK
#cmakedefine HAVE_CLOCK_GETTIME
#cmakedefine HAVE_GETHRTIME
#cmakedefine ZMQ_HAVE_UIO

4
src/signaler.cpp
View File

@ -104,7 +104,7 @@ zmq::fd_t zmq::signaler_t::get_fd ()
void zmq::signaler_t::send ()
{
#if HAVE_FORK
#if defined(HAVE_FORK)
if (unlikely(pid != getpid())) {
//printf("Child process %d signaler_t::send returning without sending #1\n", getpid());
return; // do not send anything in forked child context
@ -125,7 +125,7 @@ void zmq::signaler_t::send ()
ssize_t nbytes = ::send (w, &dummy, sizeof (dummy), 0);
if (unlikely (nbytes == -1 && errno == EINTR))
continue;
#if HAVE_FORK
#if defined(HAVE_FORK)
if (unlikely(pid != getpid())) {
//printf("Child process %d signaler_t::send returning without sending #2\n", getpid());
errno = EINTR;