diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-26 18:41:48 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-26 18:41:48 -0800 |
| commit | fdb0b28bf67cd41fd2edd5084984e714c8de6b4c (patch) | |
| tree | ca3bdc57778079aadce73516e1fba8aa5612c8a5 | |
| parent | 27786b2f70a1af14ad68bc8b5df2792ae340c3e0 (diff) | |
| download | emacs-fdb0b28bf67cd41fd2edd5084984e714c8de6b4c.tar.gz | |
* dispextern.h (struct glyph): Make u.img_id int, not unsigned.
It's always given int values and used as an int. This suppresses
a gcc "comparison of unsigned expression >= 0" warning in some
configurations.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dispextern.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 05681aa75b9..184a1bd4b4c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2011-02-27 Paul Eggert <eggert@cs.ucla.edu> + * dispextern.h (struct glyph): Make u.img_id int, not unsigned. + It's always given int values and used as an int. This suppresses + a gcc "comparison of unsigned expression >= 0" warning in some + configurations. + * dispnew.c: Rename locals to avoid shadowing. (update_text_area, scrolling_window, update_frame_1): Rename locals. diff --git a/src/dispextern.h b/src/dispextern.h index 6bb0c3a6aae..37ae7ee5fd5 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -431,7 +431,7 @@ struct glyph } cmp; /* Image ID for image glyphs (type == IMAGE_GLYPH). */ - unsigned img_id; + int img_id; /* Sub-structure for type == STRETCH_GLYPH. */ struct |