From fdb0b28bf67cd41fd2edd5084984e714c8de6b4c Mon Sep 17 00:00:00 2001 From: Paul Eggert <eggert@cs.ucla.edu> Date: Sat, 26 Feb 2011 18:41:48 -0800 Subject: [PATCH] * 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. --- src/ChangeLog | 5 +++++ src/dispextern.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 -- 2.39.5