Merge branch 'upstream' into stable

[gnulib.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 360f0dd..b025454 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-31  Eric Blake  <eblake@redhat.com>
+
+       dup2: work around Haiku bug
+       * m4/dup2.m4 (gl_FUNC_DUP2): Test for bug.
+       * lib/dup2.c (rpl_dup2) [!WIN32]: Add workaround.
+       * doc/posix-functions/dup2.texi (dup2): Document the bug.
+       * tests/test-dup2.c (main): Enhance test.
+
 2011-01-31  Simon Josefsson  <simon@josefsson.org>
 
        doc: off_t is not available in eglibc 2.11.2 stdio.h.