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.

1 files changed, 11 insertions, 11 deletions

diff --git a/src/image.c b/src/image.c
index 8d9c33de12c..bcc0fcd78a3 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1041,7 +1041,7 @@ void
 prepare_image_for_display (struct frame *f, struct image *img)
 {
   /* We're about to display IMG, so set its timestamp to `now'.  */
-  img->timestamp = current_emacs_time ();
+  img->timestamp = current_timespec ();
 
   /* If IMG doesn't have a pixmap yet, load it now, using the image
      type dependent loader function.  */
@@ -1480,7 +1480,7 @@ clear_image_cache (struct frame *f, Lisp_Object filter)
       else if (INTEGERP (Vimage_cache_eviction_delay))
         {
           /* Free cache based on timestamp.  */
-          EMACS_TIME old, t;
+          struct timespec old, t;
           double delay;
           ptrdiff_t nimages = 0;
 
@@ -1495,13 +1495,13 @@ clear_image_cache (struct frame *f, Lisp_Object filter)
             delay = 1600 * delay / nimages / nimages;
           delay = max (delay, 1);
 
-          t = current_emacs_time ();
-          old = sub_emacs_time (t, EMACS_TIME_FROM_DOUBLE (delay));
+          t = current_timespec ();
+          old = timespec_sub (t, dtotimespec (delay));
 
           for (i = 0; i < c->used; ++i)
             {
               struct image *img = c->images[i];
-              if (img && EMACS_TIME_LT (img->timestamp, old))
+              if (img && timespec_cmp (img->timestamp, old) < 0)
                 {
                   free_image (f, img);
                   ++nfreed;
@@ -1764,7 +1764,7 @@ lookup_image (struct frame *f, Lisp_Object spec)
     }
 
   /* We're using IMG, so set its timestamp to `now'.  */
-  img->timestamp = current_emacs_time ();
+  img->timestamp = current_timespec ();
 
   /* Value is the image id.  */
   return img->id;
@@ -7884,7 +7884,7 @@ struct animation_cache
 {
   MagickWand *wand;
   int index;
-  EMACS_TIME update_time;
+  struct timespec update_time;
   struct animation_cache *next;
   char signature[FLEXIBLE_ARRAY_MEMBER];
 };
@@ -7909,13 +7909,13 @@ static void
 imagemagick_prune_animation_cache (void)
 {
   struct animation_cache **pcache = &animation_cache;
-  EMACS_TIME old = sub_emacs_time (current_emacs_time (),
-                                   make_emacs_time (60, 0));
+  struct timespec old = timespec_sub (current_timespec (),
+                                      make_timespec (60, 0));
 
   while (*pcache)
     {
       struct animation_cache *cache = *pcache;
-      if (EMACS_TIME_LE (old, cache->update_time))
+      if (timespec_cmp (old, cache->update_time) <= 0)
         pcache = &cache->next;
       else
         {
@@ -7950,7 +7950,7 @@ imagemagick_get_animation_cache (MagickWand *wand)
     }
 
   DestroyString (signature);
-  cache->update_time = current_emacs_time ();
+  cache->update_time = current_timespec ();
   return cache;
 }