aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-02-26 18:41:48 -0800
committerPaul Eggert2011-02-26 18:41:48 -0800
commitfdb0b28bf67cd41fd2edd5084984e714c8de6b4c (patch)
treeca3bdc57778079aadce73516e1fba8aa5612c8a5 /src
parent27786b2f70a1af14ad68bc8b5df2792ae340c3e0 (diff)
downloademacs-fdb0b28bf67cd41fd2edd5084984e714c8de6b4c.tar.gz
emacs-fdb0b28bf67cd41fd2edd5084984e714c8de6b4c.zip
* 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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/dispextern.h2
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 @@
12011-02-27 Paul Eggert <eggert@cs.ucla.edu> 12011-02-27 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * dispextern.h (struct glyph): Make u.img_id int, not unsigned.
4 It's always given int values and used as an int. This suppresses
5 a gcc "comparison of unsigned expression >= 0" warning in some
6 configurations.
7
3 * dispnew.c: Rename locals to avoid shadowing. 8 * dispnew.c: Rename locals to avoid shadowing.
4 (update_text_area, scrolling_window, update_frame_1): Rename locals. 9 (update_text_area, scrolling_window, update_frame_1): Rename locals.
5 10
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
431 } cmp; 431 } cmp;
432 432
433 /* Image ID for image glyphs (type == IMAGE_GLYPH). */ 433 /* Image ID for image glyphs (type == IMAGE_GLYPH). */
434 unsigned img_id; 434 int img_id;
435 435
436 /* Sub-structure for type == STRETCH_GLYPH. */ 436 /* Sub-structure for type == STRETCH_GLYPH. */
437 struct 437 struct