diff options
| author | Eli Zaretskii | 2010-03-28 09:04:11 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2010-03-28 09:04:11 -0400 |
| commit | e7dbdb6dfc3ffdc25f8d32a43683500f596d9784 (patch) | |
| tree | e7e73d34fe234175f7da59690ec5abf6f73b89a7 /src/atimer.c | |
| parent | 34689d3c1ad54fd463d5f20c64bb1ac655dc5741 (diff) | |
| parent | 22ef1944028e9ac89a9717439b175ce3230a4ba1 (diff) | |
| download | emacs-e7dbdb6dfc3ffdc25f8d32a43683500f596d9784.tar.gz emacs-e7dbdb6dfc3ffdc25f8d32a43683500f596d9784.zip | |
Merge from mainline.
Diffstat (limited to 'src/atimer.c')
| -rw-r--r-- | src/atimer.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/atimer.c b/src/atimer.c index 432e2590dad..556272d7918 100644 --- a/src/atimer.c +++ b/src/atimer.c | |||
| @@ -296,12 +296,6 @@ unwind_stop_other_atimers (dummy) | |||
| 296 | static void | 296 | static void |
| 297 | set_alarm () | 297 | set_alarm () |
| 298 | { | 298 | { |
| 299 | #if defined (USG) && !defined (POSIX_SIGNALS) | ||
| 300 | /* USG systems forget handlers when they are used; | ||
| 301 | must reestablish each time. */ | ||
| 302 | signal (SIGALRM, alarm_signal_handler); | ||
| 303 | #endif /* USG */ | ||
| 304 | |||
| 305 | if (atimers) | 299 | if (atimers) |
| 306 | { | 300 | { |
| 307 | EMACS_TIME now, time; | 301 | EMACS_TIME now, time; |