diff options
| author | Paul Eggert | 2011-01-22 20:34:48 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-22 20:34:48 -0800 |
| commit | 5c7d01a54e356f905e16bdb24f9a8bfc1d676d0e (patch) | |
| tree | 25953ff3e2789876675ceb06915773522879b0a3 /src/ChangeLog | |
| parent | ce504ff0c9a0d4a997a781c962efd5b0d37ea20a (diff) | |
| parent | f77fabaf6bc1296631b1a4bcdf363721e19a3ac4 (diff) | |
| download | emacs-5c7d01a54e356f905e16bdb24f9a8bfc1d676d0e.tar.gz emacs-5c7d01a54e356f905e16bdb24f9a8bfc1d676d0e.zip | |
* src/image.c: Add cast to fix type clash
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0c5c98eac2e..06b9e313bd5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-01-23 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-01-23 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * image.c (x_create_bitmap_from_xpm_data): Add cast to fix type clash | ||
| 4 | when calling XpmCreatePixmapFromData. | ||
| 5 | |||
| 3 | Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h. | 6 | Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h. |
| 4 | * lisp.h (SSDATA): New macro. | 7 | * lisp.h (SSDATA): New macro. |
| 5 | All uses of (char *) SDATA (x) replaced with SSDATA (x), | 8 | All uses of (char *) SDATA (x) replaced with SSDATA (x), |