diff options
| author | Paul Eggert | 2013-08-27 11:47:55 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-08-27 11:47:55 -0700 |
| commit | 43aac990c339c0fc3304aa476ebc8ea8467f107e (patch) | |
| tree | 24f6477d7ec79c7f3529e08c421f309b1180c436 /src/xmenu.c | |
| parent | 278208b8e6917af1e7e2623a3869614fa70059ed (diff) | |
| download | emacs-43aac990c339c0fc3304aa476ebc8ea8467f107e.tar.gz emacs-43aac990c339c0fc3304aa476ebc8ea8467f107e.zip | |
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/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 95ae5393553..98473939373 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -377,7 +377,7 @@ x_menu_wait_for_event (void *data) | |||
| 377 | #endif | 377 | #endif |
| 378 | ) | 378 | ) |
| 379 | { | 379 | { |
| 380 | EMACS_TIME next_time = timer_check (), *ntp; | 380 | struct timespec next_time = timer_check (), *ntp; |
| 381 | SELECT_TYPE read_fds; | 381 | SELECT_TYPE read_fds; |
| 382 | struct x_display_info *dpyinfo; | 382 | struct x_display_info *dpyinfo; |
| 383 | int n = 0; | 383 | int n = 0; |
| @@ -391,7 +391,7 @@ x_menu_wait_for_event (void *data) | |||
| 391 | XFlush (dpyinfo->display); | 391 | XFlush (dpyinfo->display); |
| 392 | } | 392 | } |
| 393 | 393 | ||
| 394 | if (! EMACS_TIME_VALID_P (next_time)) | 394 | if (! timespec_valid_p (next_time)) |
| 395 | ntp = 0; | 395 | ntp = 0; |
| 396 | else | 396 | else |
| 397 | ntp = &next_time; | 397 | ntp = &next_time; |