Now using <poll.h> instead of <sys/poll.h>. Also added a bit
to autoconf to ensure we don't use poll on OS X.
This commit is contained in:
parent
6284286d4f
commit
b66a403941
|
@ -130,8 +130,11 @@ AC_DEFUN([ACX_CHECK_GETPWUID_R], [
|
||||||
|
|
||||||
AC_DEFUN([ACX_CHECK_POLL], [
|
AC_DEFUN([ACX_CHECK_POLL], [
|
||||||
AC_MSG_CHECKING([for poll])
|
AC_MSG_CHECKING([for poll])
|
||||||
AC_TRY_LINK([#include <sys/poll.h>],
|
AC_TRY_LINK([#include <poll.h>],
|
||||||
[struct pollfd ufds[] = { 0, POLLIN, 0 }; poll(ufds, 1, 10);],
|
[#if defined(_POLL_EMUL_H_)
|
||||||
|
#error emulated poll
|
||||||
|
#endif
|
||||||
|
struct pollfd ufds[] = { 0, POLLIN, 0 }; poll(ufds, 1, 10);],
|
||||||
acx_poll_ok=yes, acx_poll_ok=no)
|
acx_poll_ok=yes, acx_poll_ok=no)
|
||||||
AC_MSG_RESULT($acx_poll_ok)
|
AC_MSG_RESULT($acx_poll_ok)
|
||||||
if test x"$acx_poll_ok" = xyes; then
|
if test x"$acx_poll_ok" = xyes; then
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#if HAVE_POLL
|
#if HAVE_POLL
|
||||||
# include <sys/poll.h>
|
# include <poll.h>
|
||||||
# if HAVE_ALLOCA_H
|
# if HAVE_ALLOCA_H
|
||||||
# include <alloca.h>
|
# include <alloca.h>
|
||||||
# endif
|
# endif
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
#include "CEvent.h"
|
#include "CEvent.h"
|
||||||
#include "IEventQueue.h"
|
#include "IEventQueue.h"
|
||||||
#if HAVE_POLL
|
#if HAVE_POLL
|
||||||
# include <sys/poll.h>
|
# include <poll.h>
|
||||||
#else
|
#else
|
||||||
# if HAVE_SYS_SELECT_H
|
# if HAVE_SYS_SELECT_H
|
||||||
# include <sys/select.h>
|
# include <sys/select.h>
|
||||||
|
|
Loading…
Reference in New Issue