diff options
author | Gabriele Svelto <gabriele.svelto@gmail.com> | 2012-04-30 21:14:04 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2012-05-02 09:44:04 +0200 |
commit | 357a20ef6feae94c033eed392b025e57fe8eaa81 (patch) | |
tree | cf3c151ea004d762d5f1f967a1d49c4c2e6a3229 /src/pgm_socket.cpp | |
parent | 971cbeda3de6691b212ad18bed9e9f08b278cfe1 (diff) |
Conditionally include header files required by select() and poll()
Feature checks are introduced to check for all the headers required by
the select() and poll() calls. Include files are then included
conditionally without the use of any OS-specific directive. The change
also fixes a couple of problems:
- Fixed compilation under FreeBSD, NetBSD and OpenBSD when forcing the
use of select() in the poller
- Quieted a warning mixed-sign comparison warning on FreeBSD caused by
FD_SETSIZE being declared as an unsigned constant on that OS
- Removed the obsolescent AC_HEADER_TIME macro from the configure script
Signed-off-by: Gabriele Svelto <gabriele.svelto@gmail.com>
Diffstat (limited to 'src/pgm_socket.cpp')
-rw-r--r-- | src/pgm_socket.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/pgm_socket.cpp b/src/pgm_socket.cpp index 1c214a8..7747fe0 100644 --- a/src/pgm_socket.cpp +++ b/src/pgm_socket.cpp @@ -26,10 +26,18 @@ #ifdef XS_HAVE_WINDOWS #include "windows.hpp" -#endif - -#ifdef XS_HAVE_LINUX -#include <poll.h> +#else +# if HAVE_SYS_TYPES +# include <sys/types.h> +# endif +# if HAVE_SYS_SELECT_H +# include <sys/select.h> +# endif +# if HAVE_POLL_H +# include <poll.h> +# elif HAVE_SYS_POLL_H +# include <sys/poll.h> +# endif #endif #include <stdlib.h> |