From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 23 Jan 2011 04:34:48 +0000 (-0800)
Subject: * src/image.c: Add cast to fix type clash
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~152
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5c7d01a54e356f905e16bdb24f9a8bfc1d676d0e;p=emacs.git

* src/image.c: Add cast to fix type clash
---

5c7d01a54e356f905e16bdb24f9a8bfc1d676d0e
diff --cc src/ChangeLog
index 0c5c98eac2e,2e9e80d938d..06b9e313bd5
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,5 -1,8 +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
++	* 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),