2 files changed, 4 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c5c98eac2e..2e9e80d938d 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);