Select polling mechanism based on configure checks, not OS macros.

Signed-off-by: Martin Sustrik <[email protected]>
open-io · Dec 24, 2016 · b092596 · b092596
1 parent 4cc2b52
commit b092596
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/configure.ac b/configure.ac
@@ -139,8 +139,8 @@ AC_CHECK_FUNC([mprotect], [AC_DEFINE([HAVE_MPROTECT])])
 AC_CHECK_LIB([rt], [clock_gettime])
 AC_CHECK_FUNCS([clock_gettime])
 AC_CHECK_LIB([socket], [socket])
-AC_CHECK_FUNCS([epoll_create], [] ,[AC_DEFINE([DILL_NO_EPOLL])])
-AC_CHECK_FUNCS([kqueue], [] ,[AC_DEFINE([DILL_NO_KQUEUE])])
+AC_CHECK_FUNCS([epoll_create], [AC_DEFINE([HAVE_EPOLL])])
+AC_CHECK_FUNCS([kqueue], [AC_DEFINE([HAVE_KQUEUE])])
 
 ################################################################################
 #  Libtool                                                                     #

diff --git a/pollset.c b/pollset.c
@@ -32,9 +32,9 @@
 #elif defined DILL_POLL
 #include "poll.c.inc"
 /* Defaults. */
-#elif defined __linux__ && !defined DILL_NO_EPOLL
+#elif defined HAVE_EPOLL
 #include "epoll.c.inc"
-#elif (defined __FreeBSD__ || defined __APPLE__) && !defined DILL_NO_KQUEUE
+#elif defined HAVE_KQUEUE
 #include "kqueue.c.inc"
 #else
 #include "poll.c.inc"

diff --git a/pollset.h b/pollset.h
@@ -33,9 +33,9 @@
 #elif defined DILL_POLL
 #include "poll.h.inc"
 /* Defaults. */
-#elif defined __linux__ && !defined DILL_NO_EPOLL
+#elif defined HAVE_EPOLL
 #include "epoll.h.inc"
-#elif (defined __FreeBSD__ || defined __APPLE__) && !defined DILL_NO_KQUEUE
+#elif defined HAVE_KQUEUE
 #include "kqueue.h.inc"
 #else
 #include "poll.h.inc"