X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=f41fb6534acdafee82e9e0876bc219e353bc47b1;hb=cdf12ee48247d39e7b1fd40289b78741aa4d4df1;hp=666d98f077933b12b5accadc20c244a689869cd1;hpb=2b14869442bce932cf1d805387928484d4914d59;p=gnulib.git

diff --git a/ChangeLog b/ChangeLog
index 666d98f07..f41fb6534 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2011-07-31  Bruno Haible  <bruno@clisp.org>
 
+	Work around declaration collisions on Minix.
+	* m4/mbsinit.m4 (gl_FUNC_MBSINIT): If mbsinit is declared but not
+	defined, set REPLACE_MBSINIT.
+	* m4/mbrtowc.m4 (gl_FUNC_MBRTOWC): If mbrtowc is declared but not
+	defined, set REPLACE_MBRTOWC.
+	* m4/mbrlen.m4 (gl_FUNC_MBRLEN): If mbrlen is declared but not defined,
+	set REPLACE_MBRLEN.
+	* m4/mbsrtowcs.m4 (gl_FUNC_MBSRTOWCS): If mbsrtowcs is declared but not
+	defined, set REPLACE_MBSRTOWCS.
+	* m4/wcrtomb.m4 (gl_FUNC_WCRTOMB): If wcrtomb is declared but not
+	defined, set REPLACE_WCRTOMB.
+	* m4/wcsrtombs.m4 (gl_FUNC_WCSRTOMBS): If wcsrtombs is declared but not
+	defined, set REPLACE_WCSRTOMBS.
+
+2011-07-31  Bruno Haible  <bruno@clisp.org>
+
 	Add support for Minix with ACK compiler.
 	* m4/gnulib-common.m4 (gl_PROG_AR_RANLIB): New macro.
 	* gnulib-tool (func_import, func_create_testdir): Emit invocation of