0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-15 02:07:59 +08:00

Merge pull request #2225 from bluca/select_broken

Problem: select broken
This commit is contained in:
Constantin Rack 2016-11-24 20:00:33 +01:00 committed by GitHub
commit 4a24805f70
2 changed files with 2 additions and 2 deletions

View File

@ -898,7 +898,7 @@ FD_ZERO(&t_rfds);
FD_SET(0, &t_rfds);
tv.tv_sec = 5;
tv.tv_usec = 0;
select(1, &t_rfds, NULL, NULL, &tv);
select(1, &t_rfds, 0, 0, &tv);
]])],
[$1],[$2]
)

View File

@ -53,8 +53,8 @@ zmq::select_t::select_t (const zmq::ctx_t &ctx_) :
// Fine as long as map is not cleared.
current_family_entry_it (family_entries.end ()),
#else
retired (false),
maxfd (retired_fd),
retired (false),
#endif
stopping (false)
{