Add configure check for timerfd.h path

[senf.git] / senf / Scheduler / TimerSource.cc

diff --git a/senf/Scheduler/TimerSource.cc b/senf/Scheduler/TimerSource.cc
index 34f34c3..0c3214a 100644 (file)
--- a/senf/Scheduler/TimerSource.cc
+++ b/senf/Scheduler/TimerSource.cc
@@ -28,9 +28,10 @@
 
 // Custom includes
 #include "IdleEvent.hh"
-#ifdef HAVE_TIMERFD
-#include <sys/timerfd.h>
+#ifdef HAVE_TIMERFD_CREATE
+#include TIMERFD_H_PATH
 #endif
+#include "senf/Utils/IgnoreValue.hh"
 
 //#include "TimerSource.mpp"
 #define prefix_
@@ -127,8 +128,8 @@ prefix_ void senf::scheduler::detail::POSIXTimerSource::sigHandler(int,
         return;
     static char data = '\xD0';
     // If the write fails there's not much we can do anyways ...
-    (void) write(static_cast<POSIXTimerSource*>(siginfo->si_value.sival_ptr)->timerPipe_[1],
-                 &data, sizeof(data));
+    senf::IGNORE( write(static_cast<POSIXTimerSource*>(siginfo->si_value.sival_ptr)->timerPipe_[1],
+                        &data, sizeof(data)) );
 }
 
 prefix_ void senf::scheduler::detail::POSIXTimerSource::signal(int events)
@@ -136,7 +137,7 @@ prefix_ void senf::scheduler::detail::POSIXTimerSource::signal(int events)
     char data;
     // This should never fail since we are reading a single character from a signaled
     // filedescriptor
-    (void) read(timerPipe_[0], &data, sizeof(data));
+    senf::IGNORE( read(timerPipe_[0], &data, sizeof(data)) );
     timeoutEnabled_ = false;
 }
 
@@ -177,7 +178,7 @@ prefix_ void senf::scheduler::detail::PollTimerSource::disable()
 ///////////////////////////////////////////////////////////////////////////
 // senf::scheduler::detail::TimerFDTimerSource
 
-#ifdef HAVE_TIMERFD
+#ifdef HAVE_TIMERFD_CREATE
 prefix_ senf::scheduler::detail::TimerFDTimerSource::TimerFDTimerSource()
     : timerfd_ (-1), timeoutEnabled_ (false), timeout_ (0)
 {
@@ -253,7 +254,7 @@ prefix_ void senf::scheduler::detail::TimerFDTimerSource::signal(int events)
 {
     uint64_t expirations (0);
     // We ignore the return value since we ignore the value read anyways
-    (void) read(timerfd_, &expirations, sizeof(expirations));
+    senf::IGNORE( read(timerfd_, &expirations, sizeof(expirations)) );
 }
 
 prefix_ void senf::scheduler::detail::TimerFDTimerSource::reschedule()