[Emacs-diffs] /srv/bzr/emacs/trunk r105620: src/image.c (x_bitmap_pixmap): Cast to int to avoid compiler warnings.

[Eli Zaretskii]

------------------------------------------------------------
revno: 105620
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2011-08-30 21:15:53 +0300
message:
  src/image.c (x_bitmap_pixmap): Cast to int to avoid compiler warnings.
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-08-30 17:32:44 +0000
+++ b/src/ChangeLog     2011-08-30 18:15:53 +0000
@@ -1,5 +1,7 @@
 2011-08-30  Eli Zaretskii  <address@hidden>
 
+       * 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)

=== modified file 'src/image.c'
--- a/src/image.c       2011-08-29 03:34:25 +0000
+++ b/src/image.c       2011-08-30 18:15:53 +0000
@@ -196,7 +196,8 @@
 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