[Emacs-diffs] /srv/bzr/emacs/trunk r102951: * src/image.c: Add cast to fix type clash

[Paul Eggert]

------------------------------------------------------------
revno: 102951 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-01-22 20:34:48 -0800
message:
  * src/image.c: Add cast to fix type clash
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-23 02:56:06 +0000
+++ b/src/ChangeLog     2011-01-23 04:34:48 +0000
@@ -1,5 +1,8 @@
 2011-01-23  Paul Eggert  <address@hidden>
 
+       * 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),

=== modified file 'src/image.c'
--- a/src/image.c       2011-01-23 02:56:06 +0000
+++ b/src/image.c       2011-01-23 04:33:12 +0000
@@ -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);