diff options
| author | Martin Lucina <mato@kotelna.sk> | 2011-09-08 16:38:46 +0200 |
|---|---|---|
| committer | Martin Lucina <martin@lucina.net> | 2012-01-23 08:54:16 +0100 |
| commit | 88f712b4a31c95caef4f34c4ec65793c392314a6 (patch) | |
| tree | 2f17936ce9d53b1b13908e8d4288846aaa604263 /src/select.cpp | |
| parent | ad3e013f74d309b86e8f087932203e5787fe2d2d (diff) | |
| parent | 75af6aed482ab16997c1388fe801f74d11ec12a4 (diff) | |
Imported Debian patch 2.1.9-1debian/2.1.9-1
Diffstat (limited to 'src/select.cpp')
| -rw-r--r-- | src/select.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/select.cpp b/src/select.cpp index 56f9f74..78fb6f6 100644 --- a/src/select.cpp +++ b/src/select.cpp @@ -19,20 +19,21 @@ */ #include "platform.hpp" +#if defined ZMQ_HAVE_WINDOWS +#include "windows.hpp" +#endif #include <string.h> #include <algorithm> -#ifdef ZMQ_HAVE_WINDOWS -#include "winsock2.h" -#elif defined ZMQ_HAVE_HPUX +#if defined ZMQ_HAVE_HPUX #include <sys/param.h> #include <sys/types.h> #include <sys/time.h> #elif defined ZMQ_HAVE_OPENVMS #include <sys/types.h> #include <sys/time.h> -#else +#elif !defined ZMQ_HAVE_WINDOWS #include <sys/select.h> #endif |