diff options
| author | Jason Rumney | 2004-05-05 23:22:41 +0000 |
|---|---|---|
| committer | Jason Rumney | 2004-05-05 23:22:41 +0000 |
| commit | 279d3293d3f011dac5965b0da2d32a3a04eccb7a (patch) | |
| tree | 555c35b5ecc77cbdaf10d49285b051a0ef432e6a /src/ChangeLog | |
| parent | 971cb8347ad170e122b9f25592847734e465d915 (diff) | |
| download | emacs-279d3293d3f011dac5965b0da2d32a3a04eccb7a.tar.gz emacs-279d3293d3f011dac5965b0da2d32a3a04eccb7a.zip | |
(Display) [HAVE_NTGUI]: Redefine while loading xpm.h to avoid name clash.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 035aa78c24f..e71edf8239e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2004-05-06 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * image.c (Display) [HAVE_NTGUI]: Redefine while loading xpm.h | ||
| 4 | to avoid name clash. | ||
| 5 | |||
| 1 | 2004-05-04 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 6 | 2004-05-04 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * fileio.c (barf_or_query_if_file_exists): Use lstat. | 8 | * fileio.c (barf_or_query_if_file_exists): Use lstat. |