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 2014-06-02T14:17:07Z!michael.albinus@gmx.de
[bpt/emacs.git]
/
src
/
atimer.h
diff --git
a/src/atimer.h
b/src/atimer.h
index
a1825fc
..
379787a
100644
(file)
--- a/
src/atimer.h
+++ b/
src/atimer.h
@@
-1,5
+1,5
@@
/* Asynchronous timers.
/* Asynchronous timers.
- Copyright (C) 2000-201
3
Free Software Foundation, Inc.
+ Copyright (C) 2000-201
4
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-19,8
+19,7
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef EMACS_ATIMER_H
#define EMACS_ATIMER_H
#ifndef EMACS_ATIMER_H
#define EMACS_ATIMER_H
-#include "systime.h" /* for EMACS_TIME */
-#include <stdbool.h>
+#include <time.h>
/* Forward declaration. */
/* Forward declaration. */
@@
-52,10
+51,10
@@
struct atimer
enum atimer_type type;
/* Time when this timer is ripe. */
enum atimer_type type;
/* Time when this timer is ripe. */
-
EMACS_TIME
expiration;
+
struct timespec
expiration;
/* Interval of this timer. */
/* 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. */
/* Function to call when timer is ripe. Interrupt input is
guaranteed to not be blocked when this function is called. */
@@
-70,7
+69,7
@@
struct atimer
/* Function prototypes. */
/* Function prototypes. */
-struct atimer *start_atimer (enum atimer_type,
EMACS_TIME
,
+struct atimer *start_atimer (enum atimer_type,
struct timespec
,
atimer_callback, void *);
void cancel_atimer (struct atimer *);
void do_pending_atimers (void);
atimer_callback, void *);
void cancel_atimer (struct atimer *);
void do_pending_atimers (void);