generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-09 23:57:50 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Revert "Merge branch 'master' of github.com:ianbarber/libzmq""

Browse Source 
This reverts commit 029d3dfae2.
This commit is contained in:
Ian Barber
2012-06-12 14:43:18 +01:00
parent bdd4e1351d
commit eb14890d23
15 changed files with 331 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/signaler.cpp
View File

@@ -298,7 +298,7 @@ int zmq::signaler_t::make_fdpair (fd_t *r_, fd_t *w_)
wsa_assert (rc != SOCKET_ERROR);
// Connect writer to the listener.
rc = connect (*w_, (sockaddr *) &addr, sizeof (addr));
rc = connect (*w_, (struct sockaddr*) &addr, sizeof (addr));
wsa_assert (rc != SOCKET_ERROR);
// Accept connection from writer.
@@ -327,7 +327,7 @@ int zmq::signaler_t::make_fdpair (fd_t *r_, fd_t *w_)
//
// The bug will be fixed in V5.6 ECO4 and beyond. In the meantime, we'll
// create the socket pair manually.
sockaddr_in lcladdr;
struct sockaddr_in lcladdr;
memset (&lcladdr, 0, sizeof (lcladdr));
lcladdr.sin_family = AF_INET;
lcladdr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);