Some minor fixes

[bpt/emacs.git] / src / atimer.h

diff --git a/src/atimer.h b/src/atimer.h
index 8704bf7..379787a 100644 (file)
--- 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, 2009, 2010, 2011, 2012  Free Software Foundation, Inc.
+   Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,14 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 <time.h>
 
 /* Forward declaration.  */
 
@@ -49,7 +41,7 @@ enum atimer_type
 
 /* 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.  */
 
@@ -59,10 +51,10 @@ struct atimer
   enum atimer_type type;
 
   /* Time when this timer is ripe.  */
-  EMACS_TIME expiration;
+  struct timespec expiration;
 
   /* Interval of this timer.  */
-  EMACS_TIME interval;
+  struct timespec interval;
 
   /* Function to call when timer is ripe.  Interrupt input is
      guaranteed to not be blocked when this function is called.  */
@@ -77,17 +69,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, struct timespec,
+                             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 *);
+void run_all_atimers (void);
 
 #endif /* EMACS_ATIMER_H */
-
-/* arch-tag: 02c7c1c8-45bd-4222-b874-4ca44662f60b
-   (do not change this comment) */