* dispextern.h (struct image): Don't assume time_t <= unsigned long.

* image.c (clear_image_cache): Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index 21c03ba82200b9e2b0c28ce4706dc57a7b11fcf4..d522c639a6f4550595a0a646b15ddc199bed54f4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * dispextern.h (struct image): Don't assume time_t <= unsigned long.
+       * image.c (clear_image_cache): Likewise.
+
 2011-05-12  Paul Eggert  <eggert@cs.ucla.edu>
 
        * term.c (term_mouse_position): Don't assume time_t wraparound.

diff --git a/src/dispextern.h b/src/dispextern.h
index 72e23e6642a7607fc8955f1de1005d354fcef2c7..77c45cf2fc6e59d2df65e50967ebc7083b820629 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2709,7 +2709,7 @@ struct image
 {
   /* The time in seconds at which the image was last displayed.  Set
      in prepare_image_for_display.  */
-  unsigned long timestamp;
+  time_t timestamp;
 
   /* Pixmaps of the image.  */
   Pixmap pixmap, mask;

diff --git a/src/image.c b/src/image.c
index 23da03b6264bfac91e4e557cdd56ed5acce081fe..2562d79a782e2a8d431a70457da1a6ecfe6d3d15 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -1523,7 +1523,7 @@ clear_image_cache (struct frame *f, Lisp_Object filter)
        {
          /* Free cache based on timestamp.  */
          EMACS_TIME t;
-         unsigned long old;
+         time_t old;
          int delay, nimages = 0;
 
          for (i = 0; i < c->used; ++i)