aboutsummaryrefslogtreecommitdiffstats
path: root/src/image.c
diff options
context:
space:
mode:
authorPaul Eggert2011-01-22 20:33:12 -0800
committerPaul Eggert2011-01-22 20:33:12 -0800
commitf77fabaf6bc1296631b1a4bcdf363721e19a3ac4 (patch)
tree2172808ca90bcc20e55ff65367b03646f2e22819 /src/image.c
parentce504ff0c9a0d4a997a781c962efd5b0d37ea20a (diff)
downloademacs-f77fabaf6bc1296631b1a4bcdf363721e19a3ac4.tar.gz
emacs-f77fabaf6bc1296631b1a4bcdf363721e19a3ac4.zip
* image.c (x_create_bitmap_from_xpm_data): Add cast to fix type clash
when calling XpmCreatePixmapFromData.
Diffstat (limited to 'src/image.c')
-rw-r--r--src/image.c2
1 files changed, 1 insertions, 1 deletions
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)
3334 attrs.valuemask |= XpmColormap; 3334 attrs.valuemask |= XpmColormap;
3335 3335
3336 rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 3336 rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
3337 bits, &bitmap, &mask, &attrs); 3337 (char **) bits, &bitmap, &mask, &attrs);
3338 if (rc != XpmSuccess) 3338 if (rc != XpmSuccess)
3339 { 3339 {
3340 XpmFreeAttributes (&attrs); 3340 XpmFreeAttributes (&attrs);