From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 13 May 2011 01:10:46 +0000 (-0700)
Subject: * dispextern.h (struct image): Don't assume time_t <= unsigned long.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~239^2~23^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4e3e4d3ad71e45bcb15781e3f95ebb2687502a2;p=emacs.git

* 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 21c03ba8220..d522c639a6f 100644
--- 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 72e23e6642a..77c45cf2fc6 100644
--- 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 23da03b6264..2562d79a782 100644
--- 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)