diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-12 18:10:46 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-12 18:10:46 -0700 |
| commit | d4e3e4d3ad71e45bcb15781e3f95ebb2687502a2 (patch) | |
| tree | cb9cfa965cbde6de9e4fb716ff0c4640e2a38017 /src | |
| parent | f6a24d19906993b975e7be822abbb3cfce719751 (diff) | |
| download | emacs-d4e3e4d3ad71e45bcb15781e3f95ebb2687502a2.tar.gz | |
* dispextern.h (struct image): Don't assume time_t <= unsigned long.
* image.c (clear_image_cache): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dispextern.h | 2 | ||||
| -rw-r--r-- | src/image.c | 2 |
3 files changed, 7 insertions, 2 deletions
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) |