From f6cfbd8f9d86e64b60d932ef098f4aa59305d196 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 30 Aug 2011 21:15:53 +0300 Subject: [PATCH] src/image.c (x_bitmap_pixmap): Cast to int to avoid compiler warnings. --- src/ChangeLog | 2 ++ src/image.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index dcf4da4c363..e0f2ad096be 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-08-30 Eli Zaretskii + * 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 d6bfc4050ca..c5dcbb32e5d 100644 --- 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 -- 2.39.2