HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org
[bpt/emacs.git]
/
src
/
atimer.h
diff --git
a/src/atimer.h
b/src/atimer.h
index
c2245d3
..
2a92f1b
100644
(file)
--- a/
src/atimer.h
+++ b/
src/atimer.h
@@
-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-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-21,6
+20,7
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define EMACS_ATIMER_H
#include "systime.h" /* for EMACS_TIME */
#define EMACS_ATIMER_H
#include "systime.h" /* for EMACS_TIME */
+#include <stdbool.h>
/* Forward declaration. */
/* Forward declaration. */
@@
-75,12
+75,8
@@
struct atimer *start_atimer (enum atimer_type, EMACS_TIME,
void cancel_atimer (struct atimer *);
void do_pending_atimers (void);
void init_atimer (void);
void cancel_atimer (struct atimer *);
void do_pending_atimers (void);
void init_atimer (void);
-void turn_on_atimers (
int
);
+void turn_on_atimers (
bool
);
void stop_other_atimers (struct atimer *);
void stop_other_atimers (struct atimer *);
-void run_all_atimers (void);
Lisp_Object unwind_stop_other_atimers (Lisp_Object);
#endif /* EMACS_ATIMER_H */
Lisp_Object unwind_stop_other_atimers (Lisp_Object);
#endif /* EMACS_ATIMER_H */
-
-/* arch-tag: 02c7c1c8-45bd-4222-b874-4ca44662f60b
- (do not change this comment) */