Mercurial > emacs
changeset 101226:63d9f73bf9d9
(Ffont_variation_glyphs): Silence compiler.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 16 Jan 2009 03:26:29 +0000 |
| parents | 84ba7288e2c7 |
| children | c515c8daae0f |
| files | src/ChangeLog src/font.c |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jan 16 03:24:54 2009 +0000 +++ b/src/ChangeLog Fri Jan 16 03:26:29 2009 +0000 @@ -1,3 +1,7 @@ +2009-01-16 Glenn Morris <rgm@gnu.org> + + * font.c (Ffont_variation_glyphs): Silence compiler. + 2009-01-15 Juanma Barranquero <lekktu@gmail.com> * sound.c (SOUND_WARNING): Use _snprintf, for MSVC compatibility.
--- a/src/font.c Fri Jan 16 03:24:54 2009 +0000 +++ b/src/font.c Fri Jan 16 03:26:29 2009 +0000 @@ -4451,8 +4451,10 @@ { Lisp_Object code; int vs = (i < 16 ? 0xFE00 + i : 0xE0100 + (i - 16)); - - if (variations[i] > MOST_POSITIVE_FIXNUM) + /* Stops GCC whining about limited range of data type. */ + EMACS_INT var = variations[i]; + + if (var > MOST_POSITIVE_FIXNUM) code = Fcons (make_number ((variations[i]) >> 16), make_number ((variations[i]) & 0xFFFF)); else