# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1295757192 28800
# Node ID 11f1b475723604bfcaecf0f0c0c97105c99ceea7
# Parent  f3d87590137262ffac9669e0e1d0de23b04c85a6
* image.c (x_create_bitmap_from_xpm_data): Add cast to fix type	clash

when calling XpmCreatePixmapFromData.

diff -r f3d875901372 -r 11f1b4757236 src/ChangeLog
--- 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),
diff -r f3d875901372 -r 11f1b4757236 src/image.c
--- 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);