(fill_gstring_body): Avoid compiler warnings.

diff --git a/src/ChangeLog b/src/ChangeLog
index 029a59b2cb8e6b4b9410f0417e1b5499456d7420..c8759808038034400b8fdfcff305a94dbcda14e1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2008-08-29  Eli Zaretskii  <eliz@gnu.org>
 
+       * composite.c (fill_gstring_body): Avoid compiler warnings.
+
+       * font.c (font_fill_lglyph_metrics): Use EMACS_INT in
+       LGLYPH_SET_CODE to avoid compiler warnings.
+
        * makefile.w32-in ($(BLD)/w32uniscribe.$(O)): Depend on composite.h
 
        * composite.h (LGLYPH_SET_CODE): Cast `val' to EMACS_INT.

diff --git a/src/composite.c b/src/composite.c
index 1e19033b5a467e9e350d0d457d4098c7aeb3c305..d535e1e73ce4245afb3a96c6ec17839b70593f79 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -865,7 +865,7 @@ fill_gstring_body (gstring)
   for (i = 0; i < len; i++)
     {
       Lisp_Object g = LGSTRING_GLYPH (gstring, i);
-      int c = XINT (AREF (header, i + 1));
+      EMACS_INT c = XINT (AREF (header, i + 1));
 
       if (NILP (g))
        {