From 77fa4db298a3c04218ed85dda07f42ef700b316f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 29 Aug 2008 09:55:32 +0000 Subject: [PATCH] (fill_gstring_body): Avoid compiler warnings. --- src/ChangeLog | 5 +++++ src/composite.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + * 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)) { -- 2.39.5