diff options
| author | Kenichi Handa | 2012-10-06 21:55:09 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-10-06 21:55:09 +0900 |
| commit | 16ddec7e9e6adcf615db097d9627d490ca29208c (patch) | |
| tree | 1c16b9565c9cca81ec8f5b10f0f4110340d4654a /src/image.c | |
| parent | 2b89bca49d55cec1a004353354a76de2972c68f3 (diff) | |
| parent | d5acb99a199d83cde1a43482709c3e9d4ec34b2f (diff) | |
| download | emacs-16ddec7e9e6adcf615db097d9627d490ca29208c.tar.gz emacs-16ddec7e9e6adcf615db097d9627d490ca29208c.zip | |
merge trunk
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/image.c b/src/image.c index 7901b95f236..91eeb91920c 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -186,11 +186,11 @@ x_bitmap_width (FRAME_PTR f, ptrdiff_t id) | |||
| 186 | } | 186 | } |
| 187 | 187 | ||
| 188 | #if defined (HAVE_X_WINDOWS) || defined (HAVE_NTGUI) | 188 | #if defined (HAVE_X_WINDOWS) || defined (HAVE_NTGUI) |
| 189 | int | 189 | ptrdiff_t |
| 190 | x_bitmap_pixmap (FRAME_PTR f, ptrdiff_t id) | 190 | x_bitmap_pixmap (FRAME_PTR f, ptrdiff_t id) |
| 191 | { | 191 | { |
| 192 | /* HAVE_NTGUI needs the explicit cast here. */ | 192 | /* HAVE_NTGUI needs the explicit cast here. */ |
| 193 | return (int) FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].pixmap; | 193 | return (ptrdiff_t) FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].pixmap; |
| 194 | } | 194 | } |
| 195 | #endif | 195 | #endif |
| 196 | 196 | ||