procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Eli Zaretskii 2011-08-30 21:15:53 +03:00
parent 148ae00e30
commit f6cfbd8f9d
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -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)

3
src/image.c
View file

@ -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