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/select.cpp | |
| parent | d7923f08cab62ef40027a92f596ff45428870838 (diff) | |
| parent | 9b795de4afdd5669a9000c5d13bec61e51fbba49 (diff) | |
Merge branch 'master' of github.com:zeromq/libzmq
Diffstat (limited to 'src/select.cpp')
| -rw-r--r-- | src/select.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/select.cpp b/src/select.cpp index 35d8bd8..5d5ce5d 100644 --- a/src/select.cpp +++ b/src/select.cpp @@ -19,12 +19,8 @@ */ #include "platform.hpp" - -#include <string.h> -#include <algorithm> - -#ifdef ZMQ_HAVE_WINDOWS -#include "winsock2.h" +#if defined ZMQ_HAVE_WINDOWS +#include "windows.hpp" #elif defined ZMQ_HAVE_HPUX #include <sys/param.h> #include <sys/types.h> @@ -36,6 +32,9 @@ #include <sys/select.h> #endif +#include <string.h> +#include <algorithm> + #include "select.hpp" #include "err.hpp" #include "config.hpp" |