diff options
| author | Dmitry Antipov | 2014-07-25 21:14:01 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2014-07-25 21:14:01 +0400 |
| commit | 77109fa849e67b8efab9454002cc10249d0b22da (patch) | |
| tree | 078bada265d268974b4c4bd8a6a25b04ac04dc46 /src | |
| parent | 4e69163f5fe35a8e79f03c9dcabde03e742ce06e (diff) | |
| download | emacs-77109fa849e67b8efab9454002cc10249d0b22da.tar.gz emacs-77109fa849e67b8efab9454002cc10249d0b22da.zip | |
* atimer.c (set_alarm) [HAVE_ITIMERSPEC]: Use TIMER_ABSTIME
because atimer expiration is absolute rather than relative.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/atimer.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 08807cd5c09..8ef82e125f5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-07-26 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * atimer.c (set_alarm) [HAVE_ITIMERSPEC]: Use TIMER_ABSTIME | ||
| 4 | because atimer expiration is absolute rather than relative. | ||
| 5 | |||
| 1 | 2014-07-25 Eli Zaretskii <eliz@gnu.org> | 6 | 2014-07-25 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * w32term.h (current_popup_menu, menubar_in_use): Move | 8 | * w32term.h (current_popup_menu, menubar_in_use): Move |
diff --git a/src/atimer.c b/src/atimer.c index e457a7fcf1c..c4f062beb17 100644 --- a/src/atimer.c +++ b/src/atimer.c | |||
| @@ -291,7 +291,7 @@ set_alarm (void) | |||
| 291 | struct itimerspec ispec; | 291 | struct itimerspec ispec; |
| 292 | ispec.it_value = atimers->expiration; | 292 | ispec.it_value = atimers->expiration; |
| 293 | ispec.it_interval.tv_sec = ispec.it_interval.tv_nsec = 0; | 293 | ispec.it_interval.tv_sec = ispec.it_interval.tv_nsec = 0; |
| 294 | if (timer_settime (alarm_timer, 0, &ispec, 0) == 0) | 294 | if (timer_settime (alarm_timer, TIMER_ABSTIME, &ispec, 0) == 0) |
| 295 | return; | 295 | return; |
| 296 | } | 296 | } |
| 297 | #endif | 297 | #endif |