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/dispextern.h | |
| 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/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index cb9dddd82cb..a5cb66f7d5e 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -83,7 +83,7 @@ typedef XImagePtr XImagePtr_or_DC; | |||
| 83 | #endif | 83 | #endif |
| 84 | 84 | ||
| 85 | #ifdef HAVE_WINDOW_SYSTEM | 85 | #ifdef HAVE_WINDOW_SYSTEM |
| 86 | # include "systime.h" | 86 | # include <time.h> |
| 87 | #endif | 87 | #endif |
| 88 | 88 | ||
| 89 | #ifndef HAVE_WINDOW_SYSTEM | 89 | #ifndef HAVE_WINDOW_SYSTEM |
| @@ -2710,7 +2710,7 @@ reset_mouse_highlight (Mouse_HLInfo *hlinfo) | |||
| 2710 | hlinfo->mouse_face_mouse_x = hlinfo->mouse_face_mouse_y = 0; | 2710 | hlinfo->mouse_face_mouse_x = hlinfo->mouse_face_mouse_y = 0; |
| 2711 | hlinfo->mouse_face_beg_x = hlinfo->mouse_face_end_x = 0; | 2711 | hlinfo->mouse_face_beg_x = hlinfo->mouse_face_end_x = 0; |
| 2712 | hlinfo->mouse_face_face_id = DEFAULT_FACE_ID; | 2712 | hlinfo->mouse_face_face_id = DEFAULT_FACE_ID; |
| 2713 | hlinfo->mouse_face_mouse_frame = NULL; | 2713 | hlinfo->mouse_face_mouse_frame = NULL; |
| 2714 | hlinfo->mouse_face_window = Qnil; | 2714 | hlinfo->mouse_face_window = Qnil; |
| 2715 | hlinfo->mouse_face_overlay = Qnil; | 2715 | hlinfo->mouse_face_overlay = Qnil; |
| 2716 | hlinfo->mouse_face_past_end = 0; | 2716 | hlinfo->mouse_face_past_end = 0; |
| @@ -2914,7 +2914,7 @@ struct image | |||
| 2914 | { | 2914 | { |
| 2915 | /* The time in seconds at which the image was last displayed. Set | 2915 | /* The time in seconds at which the image was last displayed. Set |
| 2916 | in prepare_image_for_display. */ | 2916 | in prepare_image_for_display. */ |
| 2917 | EMACS_TIME timestamp; | 2917 | struct timespec timestamp; |
| 2918 | 2918 | ||
| 2919 | /* Pixmaps of the image. */ | 2919 | /* Pixmaps of the image. */ |
| 2920 | Pixmap pixmap, mask; | 2920 | Pixmap pixmap, mask; |