Merge from emacs-24; up to 2012-12-01T13:25:13Z!cyd@gnu.org

[gnu-emacs] / src / atimer.h

diff --git a/src/atimer.h b/src/atimer.h
index 8035681b2251b2563e7f8c23793aa502156ba1ca..6d441d71641faad8a23199688486637be6cf3605 100644 (file)
--- a/src/atimer.h
+++ b/src/atimer.h
@@ -1,5 +1,5 @@
 /* Asynchronous timers.
-   Copyright (C) 2000-2011  Free Software Foundation, Inc.
+   Copyright (C) 2000-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,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 */
+#include <stdbool.h>
 
 /* Forward declaration.  */
 
@@ -74,7 +75,7 @@ struct atimer *start_atimer (enum atimer_type, EMACS_TIME,
 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 *);
 Lisp_Object unwind_stop_other_atimers (Lisp_Object);