Mercurial > emacs
changeset 112439:5610f272341f
* src/image.c: Add cast to fix type clash
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sat, 22 Jan 2011 20:34:48 -0800 |
| parents | 473533159689 (current diff) 11f1b4757236 (diff) |
| children | 2097405cdc11 |
| files | src/ChangeLog |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Jan 22 19:33:59 2011 -0800 +++ b/src/ChangeLog Sat Jan 22 20:34:48 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 19:33:59 2011 -0800 +++ b/src/image.c Sat Jan 22 20:34:48 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);