Commit 5c7d01a5 authored by Paul Eggert's avatar Paul Eggert

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

parents ce504ff0 f77fabaf
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),
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment