# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1083799361 0
# Node ID 929f51db2b0bf574485ea4bd499f03fb9bc99d64
# Parent  b9215c2d57add99e2c88ea409b6dd2e15cd7dab2
*** empty log message ***

diff -r b9215c2d57ad -r 929f51db2b0b src/ChangeLog
--- a/src/ChangeLog	Wed May 05 23:21:55 2004 +0000
+++ b/src/ChangeLog	Wed May 05 23:22:41 2004 +0000
@@ -1,3 +1,8 @@
+2004-05-06  Jason Rumney  <jasonr@gnu.org>
+
+	* image.c (Display) [HAVE_NTGUI]: Redefine while loading xpm.h
+	to avoid name clash.
+
 2004-05-04  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* fileio.c (barf_or_query_if_file_exists): Use lstat.