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

* src/image.c: Add cast to fix type clash

Browse source
This commit is contained in:
Paul Eggert 2011-01-22 20:34:48 -08:00
commit 5c7d01a54e
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2011-01-23 Paul Eggert <eggert@cs.ucla.edu>
* image.c (x_create_bitmap_from_xpm_data): Add cast to fix type clash
when calling XpmCreatePixmapFromData.
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
* lisp.h (SSDATA): New macro.
All uses of (char *) SDATA (x) replaced with SSDATA (x),

2
src/image.c
View file

@ -3334,7 +3334,7 @@ x_create_bitmap_from_xpm_data (struct frame *f, const char **bits)
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);