diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-22 20:34:48 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-22 20:34:48 -0800 |
| commit | 5c7d01a54e356f905e16bdb24f9a8bfc1d676d0e (patch) | |
| tree | 25953ff3e2789876675ceb06915773522879b0a3 /src | |
| parent | ce504ff0c9a0d4a997a781c962efd5b0d37ea20a (diff) | |
| parent | f77fabaf6bc1296631b1a4bcdf363721e19a3ac4 (diff) | |
| download | emacs-5c7d01a54e356f905e16bdb24f9a8bfc1d676d0e.tar.gz | |
* src/image.c: Add cast to fix type clash
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/image.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0c5c98eac2e..06b9e313bd5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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), diff --git a/src/image.c b/src/image.c index 542968d2a76..1cf16f6eeb1 100644 --- a/src/image.c +++ b/src/image.c @@ -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); |