Mercurial > emacs
changeset 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 | f3d875901372 |
| children | 5610f272341f b5017c649dfb |
| files | src/ChangeLog src/image.c |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Jan 22 20:30:57 2011 -0800 +++ b/src/ChangeLog Sat Jan 22 20:33:12 2011 -0800 @@ -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),
--- 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);