Mercurial > emacs
diff src/image.c @ 112438:11f1b4757236
* image.c (x_create_bitmap_from_xpm_data): Add cast to fix type clash
when calling XpmCreatePixmapFromData.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Sat, 22 Jan 2011 20:33:12 -0800 |
parents | 9de5a68b57e1 |
children |
line wrap: on
line diff
--- a/src/image.c Sat Jan 22 20:30:57 2011 -0800 +++ b/src/image.c Sat Jan 22 20:33:12 2011 -0800 @@ -3334,7 +3334,7 @@ attrs.valuemask |= XpmColormap; rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), - bits, &bitmap, &mask, &attrs); + (char **) bits, &bitmap, &mask, &attrs); if (rc != XpmSuccess) { XpmFreeAttributes (&attrs);