HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* image.c (x_edge_detection): Remove unnecessary cast that
[bpt/emacs.git]
/
src
/
atimer.c
diff --git
a/src/atimer.c
b/src/atimer.c
index
9fd9dee
..
309a4ea
100644
(file)
--- a/
src/atimer.c
+++ b/
src/atimer.c
@@
-1,6
+1,5
@@
/* Asynchronous timers.
/* Asynchronous timers.
- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2000-2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-26,10
+25,7
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "systime.h"
#include "blockinput.h"
#include "atimer.h"
#include "systime.h"
#include "blockinput.h"
#include "atimer.h"
-
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
#include <unistd.h>
-#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
@@
-171,9
+167,9
@@
cancel_atimer (struct atimer *timer)
for (t = *list, prev = NULL; t && t != timer; prev = t, t = t->next)
;
for (t = *list, prev = NULL; t && t != timer; prev = t, t = t->next)
;
- /* If it is, take it off
the its list, and put in on the
- free-list. We don't bother to arrange for setting a
-
different alarm time,
since a too early one doesn't hurt. */
+ /* If it is, take it off
its list, and put in on the free-list.
+ We don't bother to arrange for setting a different alarm time,
+ since a too early one doesn't hurt. */
if (t)
{
if (prev)
if (t)
{
if (prev)
@@
-447,5
+443,3
@@
init_atimer (void)
signal (SIGALRM, alarm_signal_handler);
}
signal (SIGALRM, alarm_signal_handler);
}
-/* arch-tag: e6308261-eec6-404b-89fb-6e5909518d70
- (do not change this comment) */