*** empty log message ***

diff --git a/nt/ChangeLog b/nt/ChangeLog
index f07d0e1e8f324bbad5e1ac97b2bb7c05c0cb7153..66e1ea154386e3831b21c4d8c6f5bd5ec907f673 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,5 +1,9 @@
 2005-06-11  Eli Zaretskii  <eliz@gnu.org>
 
+       * configure.bat: If their fc.exe returns a meaningful exit status,
+       don't overwrite src/config.h and src/epaths.h with identical
+       copies.
+
        * INSTALL: Warn about using "cvs up -kb" if one intends to commit
        changes.  Add a pointer to another site with detailed configure
        and build instructions.  Suggest to look at config.log when
@@ -9,7 +13,7 @@
        * gmake.defs (ARCH_CFLAGS): Use $(MCPU_FLAG) instead of a literal
        "-mcpu=i686".
 
-       * configure1.bat: Update copyright years.
+       * configure.bat: Update copyright years.
        Delete config.log before doing anything else.
        Write additional diagnostics to config.log in case of failures to
        compile test programs, including the failed test program itself.

diff --git a/src/ChangeLog b/src/ChangeLog
index 34c19326c988d10b7de24c2305001c9b68cb401f..0232aea8b48521f5a919f426759091daa8b7fbe1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-11  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32bdf.c (create_offscreen_bitmap): Cast `bitsp' to `void **' in
+       the call to CreateDIBSection, to avoid a compiler warning.
+
 2005-06-11  Jason Rumney  <jasonr@gnu.org>
 
        * w32fns.c (Fx_file_dialog): Unblock input before falling back to