diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-26 18:06:23 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-26 18:06:23 -0700 |
| commit | a615a3aeef0fb1469dcf89e2217a027a6dce82c1 (patch) | |
| tree | 6a9d26ac4b2a5ac287af1485234637c992474e12 /src/atimer.c | |
| parent | 3670daf7f9a480d8e87b292ff7051d5be331c6b4 (diff) | |
| download | emacs-a615a3aeef0fb1469dcf89e2217a027a6dce82c1.tar.gz | |
Check more robustly for timer_settime.
This should fix an OS X build problem reported by Ivan Andrus in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00671.html>.
* admin/merge-gnulib (GNULIB_MODULES): Add timer-time.
* configure.ac (gl_THREADLIB): Define to empty, since Emacs
does threads its own way.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* m4/timer_time.m4: New file, from gnulib.
* src/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.
Diffstat (limited to 'src/atimer.c')
| -rw-r--r-- | src/atimer.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |