diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-07 10:39:03 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-07 10:39:03 -0500 |
| commit | fbb68a84ee16345203f896f29b93e92a52582201 (patch) | |
| tree | 6ea41119ba1f55d479effba3e922845d5f76b9e2 /ChangeLog | |
| parent | 28926a1be178dd3b5811219e32b0d6b937bf21cf (diff) | |
| parent | 8ecd6b2a1283a28bcf56cfe48099fafa412a3929 (diff) | |
| download | glibc-fbb68a84ee16345203f896f29b93e92a52582201.tar.gz glibc-fbb68a84ee16345203f896f29b93e92a52582201.tar.xz glibc-fbb68a84ee16345203f896f29b93e92a52582201.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index cafa830c11..8f9558c565 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,13 @@ * string/test-strcpy.c (do_one_test): Fix format string for WIDE use. +2012-01-06 Joseph Myers <joseph@codesourcery.com> + + [BZ #13566] + * assert/assert.h (static_assert): Don't define for C++. + * libio/stdio.h (gets): Do declare for C++ <= C++11. + * wcsmbs/uchar.h (char16_t, char32_t): Don't typedef for C++11. + 2012-01-03 Ulrich Drepper <drepper@gmail.com> * iconv/loop.c (single loop): Fix assertion in storing of |