diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2011-06-19 09:15:06 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2011-06-19 09:15:06 +0200 |
commit | 4b60023b96d25571f58e50899a2717da14866e6b (patch) | |
tree | b355f3e22b1f340edcaf82394d3cb407d3bfdfb7 /src/ctx.cpp | |
parent | d7923f08cab62ef40027a92f596ff45428870838 (diff) | |
parent | 9b795de4afdd5669a9000c5d13bec61e51fbba49 (diff) |
Merge branch 'master' of github.com:zeromq/libzmq
Diffstat (limited to 'src/ctx.cpp')
-rw-r--r-- | src/ctx.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ctx.cpp b/src/ctx.cpp index 783bcba..8aa10d9 100644 --- a/src/ctx.cpp +++ b/src/ctx.cpp @@ -18,24 +18,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "platform.hpp" +#if defined ZMQ_HAVE_WINDOWS +#include "windows.hpp" +#else +#include <unistd.h> +#endif + #include <new> #include <string.h> #include "ctx.hpp" #include "socket_base.hpp" #include "io_thread.hpp" -#include "platform.hpp" #include "reaper.hpp" #include "pipe.hpp" #include "err.hpp" #include "msg.hpp" -#if defined ZMQ_HAVE_WINDOWS -#include "windows.h" -#else -#include "unistd.h" -#endif - zmq::ctx_t::ctx_t (uint32_t io_threads_) : tag (0xbadcafe0), terminating (false) |