diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-08-27 11:47:55 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-08-27 11:47:55 -0700 |
| commit | 43aac990c339c0fc3304aa476ebc8ea8467f107e (patch) | |
| tree | 24f6477d7ec79c7f3529e08c421f309b1180c436 /src/atimer.h | |
| parent | 278208b8e6917af1e7e2623a3869614fa70059ed (diff) | |
| download | emacs-43aac990c339c0fc3304aa476ebc8ea8467f107e.tar.gz | |
Simplify EMACS_TIME-related code.
This portability layer is no longer needed, since Emacs has been
using struct timespec as a portability layer for some time.
Merge from gnulib, incorporating:
2013-08-27 timespec: new convenience constants and function
* src/atimer.h, src/buffer.h, src/dispextern.h, src/xgselect.h:
Include <time.h> rather than "systime.h"; that's all that's needed now.
* src/dispnew.c: Include <timespec.h> rather than "systime.h";
that's all that's needed now.
* src/systime.h (EMACS_TIME): Remove. All uses changed to struct timespec.
(EMACS_TIME_RESOLUTION): Remove. All uses changed to
TIMESPEC_RESOLUTION.
(LOG10_EMACS_TIME_RESOLUTION): Remove. All uses changed to
LOG10_TIMESPEC_RESOLUTION.
(EMACS_SECS, emacs_secs_addr): Remove. All uses changed to tv_sec.
(EMACS_NSECS): Remove. All uses changed to tv_nsec.
(make_emacs_time): Remove. All used changed to make_timespec.
(invalid_timespec): Rename from invalid_emacs_time. All uses changed.
(current_timespec): Rename from current_emacs_time. All uses changed.
(add_emacs_time): Remove. All uses changed to timespec_add.
(sub_emacs_time): Remove. All uses change dot timespec_sub.
(EMACS_TIME_SIGN): Remove. All uses changed to timespec_sign.
(timespec_valid_p): Rename from EMACS_TIME_VALID_P. All uses changed.
(EMACS_TIME_FROM_DOUBLE): Remove. All uses changed to dtotimespec.
(EMACS_TIME_TO_DOUBLE): Remove. All uses changed to timespectod.
(current_timespec): Rename from current_emacs_time. All uses changed.
(EMACS_TIME_EQ, EMACS_TIME_LT, EMACS_TIME_LE): Remove. All uses
changed to timespec_cmp.
* src/xgselect.c: Include <timespec.h>, since our .h files don't.
Diffstat (limited to 'src/atimer.h')
| -rw-r--r-- | src/atimer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/atimer.h b/src/atimer.h index a1825fc0933..8c4d732aa4e 100644 --- a/src/atimer.h +++ b/src/atimer.h @@ -19,8 +19,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #ifndef EMACS_ATIMER_H #define EMACS_ATIMER_H -#include "systime.h" /* for EMACS_TIME */ #include <stdbool.h> +#include <time.h> /* Forward declaration. */ @@ -52,10 +52,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. */ @@ -70,7 +70,7 @@ struct atimer /* 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); |