2 files changed, 10 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 445090fb2a1..c920f091063 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Check more robustly for timer_settime.
+        * atimer.c (alarm_timer, alarm_timer_ok, set_alarm, init_atimer):
+        Use HAVE_TIMER_SETTIME, not SIGEV_SIGNAL, to decide whether to
+        call timer_settime.
+
 2012-09-26  Tomohiro Matsuyama  <tomo@cx4a.org>
 
         * profiler.c (Fprofiler_cpu_start): Remove unnecessary flag SA_SIGINFO.
diff --git a/src/atimer.c b/src/atimer.c
index 8bb80445bde..048c62798ef 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -42,7 +42,7 @@ static struct atimer *atimers;
 
 /* The alarm timer and whether it was properly initialized, if
    POSIX timers are available.  */
-#ifdef SIGEV_SIGNAL
+#ifdef HAVE_TIMER_SETTIME
 static timer_t alarm_timer;
 static bool alarm_timer_ok;
 #endif
@@ -296,7 +296,7 @@ set_alarm (void)
 #endif
       EMACS_TIME now, interval;
 
-#ifdef SIGEV_SIGNAL
+#ifdef HAVE_TIMER_SETTIME
       if (alarm_timer_ok)
         {
           struct itimerspec ispec;
@@ -416,7 +416,7 @@ void
 init_atimer (void)
 {
   struct sigaction action;
-#ifdef SIGEV_SIGNAL
+#ifdef HAVE_TIMER_SETTIME
   struct sigevent sigev;
   sigev.sigev_notify = SIGEV_SIGNAL;
   sigev.sigev_signo = SIGALRM;