src/image.c (x_bitmap_pixmap): Cast to int to avoid compiler warnings.

diff --git a/src/ChangeLog b/src/ChangeLog
index dcf4da4c36383239bf4aab7643354557b1cadd45..e0f2ad096bebe5f29393caeb3c44549e617d37fd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-08-30  Eli Zaretskii  <eliz@gnu.org>
 
+       * image.c (x_bitmap_pixmap): Cast to int to avoid compiler warnings.
+
        * xdisp.c (produce_stretch_glyph): No longer static, compiled also
        when HAVE_WINDOW_SYSTEM is not defined.  Support both GUI and TTY
        frames.  Call tty_append_glyph in the TTY case.  (Bug#9402)

diff --git a/src/image.c b/src/image.c
index d6bfc4050caa566b394883f20bd11613506b75c8..c5dcbb32e5d5e0609f18309769143643356ce0b3 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -196,7 +196,8 @@ x_bitmap_width (FRAME_PTR f, ptrdiff_t id)
 int
 x_bitmap_pixmap (FRAME_PTR f, ptrdiff_t id)
 {
-  return FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].pixmap;
+  /* HAVE_NTGUI needs the explicit cast here.  */
+  return (int) FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].pixmap;
 }
 #endif