(fill_gstring_body): Avoid compiler warnings.

2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 029a59b2cb8..c8759808038 100644
--- 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 1e19033b5a4..d535e1e73ce 100644
--- 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))
         {