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

This reverts commit dde69fb9fb.
This commit is contained in:
Ian Barber
2012-06-12 14:28:32 +01:00
parent 029d3dfae2
commit bdd4e1351d
6 changed files with 46 additions and 18 deletions

View File

@@ -53,6 +53,7 @@ namespace zmq
// Handlers for incoming commands.
void process_plug ();
void process_term (int linger_);
// Handlers for I/O events.
void in_event ();