[Minor] Fix usage of signalfd and timerfd

diff --git a/contrib/libev/CMakeLists.txt b/contrib/libev/CMakeLists.txt
index e81aaee3fbb58593ade73ccb36024c7117f7281e..53ab6c3623be74332a25a6680431dcc8d2179574 100644 (file)
--- a/contrib/libev/CMakeLists.txt
+++ b/contrib/libev/CMakeLists.txt
@@ -38,7 +38,10 @@ IF(HAVE_SYS_EVENTFD_H)
        CHECK_SYMBOL_EXISTS(eventfd sys/eventfd.h HAVE_EVENTFD)
 ENDIF()
 IF(HAVE_SYS_SIGNALFD_H)
-       CHECK_SYMBOL_EXISTS(signalfd sys/signalfd.h HAVE_EVENTFD)
+       CHECK_SYMBOL_EXISTS(signalfd sys/signalfd.h HAVE_SIGNALFD)
+ENDIF()
+IF(HAVE_SYS_TIMERFD_H)
+       CHECK_SYMBOL_EXISTS(timerfd_create sys/timerfd.h HAVE_TIMERFD)
 ENDIF()
 IF(HAVE_LINUX_FS_H)
        CHECK_SYMBOL_EXISTS(RWF_SUPPORTED linux/fs.h HAVE_KERNEL_RWF_T)

diff --git a/contrib/libev/config.h.in b/contrib/libev/config.h.in
index 10fc6271a6b4f50eca91bde5b1d88dfa0813a4d8..686a37988f98f905b4abe2842b9406b33b9e9ec3 100644 (file)
--- a/contrib/libev/config.h.in
+++ b/contrib/libev/config.h.in
@@ -63,6 +63,9 @@
 /* Define to 1 if you have the `signalfd' function. */
 #cmakedefine HAVE_SIGNALFD 1
 
+/* Define to 1 if you have the `timerfd_create' function. */
+#cmakedefine HAVE_TIMERFD 1
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #cmakedefine HAVE_STDINT_H 1
 

diff --git a/contrib/libev/ev.c b/contrib/libev/ev.c
index 297fa7e1b5a1bc0bbd1e11edc71d89864f0a6e39..a9660cd22a898ea0f8835555b946d2e94836ccbb 100644 (file)
--- a/contrib/libev/ev.c
+++ b/contrib/libev/ev.c
@@ -184,7 +184,7 @@
 #  define EV_USE_EVENTFD 0
 # endif
 
-# if HAVE_SYS_TIMERFD_H
+# if HAVE_SYS_TIMERFD_H && HAVE_TIMERFD
 #  ifndef EV_USE_TIMERFD
 #   define EV_USE_TIMERFD EV_FEATURE_OS
 #  endif