(uniscribe_shape): Shut up compiler warning in LGLYPH_SET_CODE.

diff --git a/src/ChangeLog b/src/ChangeLog
index bd3d2cc3a81c82ec136060fda541b491800cdbd8..029a59b2cb8e6b4b9410f0417e1b5499456d7420 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in ($(BLD)/w32uniscribe.$(O)): Depend on composite.h
+
+       * composite.h (LGLYPH_SET_CODE): Cast `val' to EMACS_INT.
+
+       * w32uniscribe.c (uniscribe_shape): Shut up compiler warning in
+       LGLYPH_SET_CODE.
+
 2008-08-29  Kenichi Handa  <handa@m17n.org>
 
        * fileio.c (report_file_error): Don't downcase the first character

diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 461903543d1fe5b15fcda34cc279b730a13457d7..871b7925ddce2328eb47155f7fc0cb720732f5b1 100644 (file)
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -339,13 +339,18 @@ uniscribe_shape (lgstring)
                  int lglyph_index = j + done_glyphs;
                  Lisp_Object lglyph = LGSTRING_GLYPH (lgstring, lglyph_index);
                  ABC char_metric;
+                 unsigned gl;
 
                  if (NILP (lglyph))
                    {
                      lglyph = Fmake_vector (make_number (LGLYPH_SIZE), Qnil);
                      LGSTRING_SET_GLYPH (lgstring, lglyph_index, lglyph);
                    }
-                 LGLYPH_SET_CODE (lglyph, glyphs[j]);
+                 /* Copy to a 32-bit data type to shut up the
+                    compiler warning in LGLYPH_SET_CODE about
+                    comparison being always false.  */
+                 gl = glyphs[j];
+                 LGLYPH_SET_CODE (lglyph, gl);
 
                  /* Detect clusters, for linking codes back to characters.  */
                  if (attributes[j].fClusterStart)