*** empty log message ***

diff --git a/lib/ChangeLog b/lib/ChangeLog
index aafe9f0023a7b538c3cd7cdfa8fa3725ee6e8ce2..ec7052c0a77e6ee567443b85e3213afd7d6eb530 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,17 @@
+2003-10-08  Paul Eggert  <eggert@twinsun.com>
+
+       Merge from gnulib.
+
+       * unlocked-io.h: Include <stdio.h>, so that the caller
+       doesn't have to include <stdio.h> before us.
+       (clearerr_unlocked, feof_unlocked, ferror_unlocked,
+       fflush_unlocked, fgets_unlocked, fputc_unlocked, fputs_unlocked,
+       fread_unlocked, fwrite_unlocked, getc_unlocked, getchar_unlocked,
+       putc_unlocked, putchar_unlocked): Define to the unlocked counterpart
+       if not declared, so that we can use getpass.c code from libc without
+       rewriting it.
+       (flockfile, ftrylockfile, funlockfile): New macros.
+
 2004-01-14  Paul Eggert  <eggert@twinsun.com>
 
        Merge from gnulib.