X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/9850eff524bd0747a9561f3b4c90dfc3749f4ecb..acfa068f4a1a4652b784af1d7aaac92929399249:/src/atimer.h
diff --git a/src/atimer.h b/src/atimer.h
index bf0d040161..6d441d7164 100644
--- a/src/atimer.h
+++ b/src/atimer.h
@@ -1,6 +1,5 @@
/* Asynchronous timers.
- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2000-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -20,14 +19,8 @@ along with GNU Emacs. If not, see . */
#ifndef EMACS_ATIMER_H
#define EMACS_ATIMER_H
-/* Declare the prototype for a general external function. */
-#if defined (PROTOTYPES) || defined (WINDOWSNT)
-#define P_(proto) proto
-#else
-#define P_(proto) ()
-#endif
-
#include "systime.h" /* for EMACS_TIME */
+#include
/* Forward declaration. */
@@ -43,13 +36,13 @@ enum atimer_type
/* Timer is ripe at now plus an offset. */
ATIMER_RELATIVE,
- /* Timer runs continously. */
+ /* Timer runs continuously. */
ATIMER_CONTINUOUS
};
/* Type of timer callback functions. */
-typedef void (* atimer_callback) P_ ((struct atimer *timer));
+typedef void (* atimer_callback) (struct atimer *timer);
/* Structure describing an asynchronous timer. */
@@ -77,17 +70,13 @@ struct atimer
/* Function prototypes. */
-struct atimer *start_atimer P_ ((enum atimer_type, EMACS_TIME,
- atimer_callback, void *));
-void cancel_atimer P_ ((struct atimer *));
-void do_pending_atimers P_ ((void));
-void init_atimer P_ ((void));
-void turn_on_atimers P_ ((int));
-void stop_other_atimers P_ ((struct atimer *));
-void run_all_atimers P_ ((void));
-Lisp_Object unwind_stop_other_atimers P_ ((Lisp_Object));
+struct atimer *start_atimer (enum atimer_type, EMACS_TIME,
+ atimer_callback, void *);
+void cancel_atimer (struct atimer *);
+void do_pending_atimers (void);
+void init_atimer (void);
+void turn_on_atimers (bool);
+void stop_other_atimers (struct atimer *);
+Lisp_Object unwind_stop_other_atimers (Lisp_Object);
#endif /* EMACS_ATIMER_H */
-
-/* arch-tag: 02c7c1c8-45bd-4222-b874-4ca44662f60b
- (do not change this comment) */