# HG changeset patch # User Paul Eggert # Date 1295757288 28800 # Node ID 5610f272341fe13b5f67cedc952196de7813275b # Parent 473533159689b1bc983d46f5f9b05d7f0c9eda5a# Parent 11f1b475723604bfcaecf0f0c0c97105c99ceea7 * src/image.c: Add cast to fix type clash diff -r 11f1b4757236 -r 5610f272341f src/ChangeLog --- a/src/ChangeLog Sat Jan 22 20:33:12 2011 -0800 +++ b/src/ChangeLog Sat Jan 22 20:34:48 2011 -0800 @@ -1,6 +1,6 @@ 2011-01-23 Paul Eggert - * 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.