This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.15-29-gc3a8723
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 7 Jan 2012 15:41:18 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-29-gc3a8723
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via c3a87236702cb73be1dada3438bbd3c3934e83f8 (commit)
via fbb68a84ee16345203f896f29b93e92a52582201 (commit)
via 28926a1be178dd3b5811219e32b0d6b937bf21cf (commit)
via df78418ad7f16500fb52f3075aada0ed9e22abe2 (commit)
from 8ecd6b2a1283a28bcf56cfe48099fafa412a3929 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c3a87236702cb73be1dada3438bbd3c3934e83f8
commit c3a87236702cb73be1dada3438bbd3c3934e83f8
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Jan 7 10:41:00 2012 -0500
Do not declare gets in _GNU_SOURCE mode at all
diff --git a/ChangeLog b/ChangeLog
index 8f9558c..f089e19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2012-01-07 Ulrich Drepper <drepper@gmail.com>
+ * libio/stdio.h: Do not declare gets at all for _GNU_SOURCE.
+
* elf/tst-unique3.cc: Add explicit declaration of gets.
* elf/tst-unique3lib.cc: Likewise.
* elf/tst-unique3lib2.cc: Likewise.
diff --git a/libio/stdio.h b/libio/stdio.h
index d9cb573..28c98e9 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -629,7 +629,7 @@ extern char *fgets (char *__restrict __s, int __n, FILE *__restrict __stream)
__wur;
#if !defined __USE_ISOC11 \
- || (defined __cplusplus && __cplusplus <= 201103L)
+ || (defined __cplusplus && __cplusplus <= 201103L && !defined __USE_GNU)
/* Get a newline-terminated string from stdin, removing the newline.
DO NOT USE THIS FUNCTION!! There is no limit on how much it will read.
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fbb68a84ee16345203f896f29b93e92a52582201
commit fbb68a84ee16345203f896f29b93e92a52582201
Merge: 28926a1 8ecd6b2
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Jan 7 10:39:03 2012 -0500
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
diff --cc ChangeLog
index cafa830,da900aa..8f9558c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,10 +1,19 @@@
+2012-01-07 Ulrich Drepper <drepper@gmail.com>
+
+ * elf/tst-unique3.cc: Add explicit declaration of gets.
+ * elf/tst-unique3lib.cc: Likewise.
+ * elf/tst-unique3lib2.cc: Likewise.
+ * elf/tst-unique4.cc: Likewise.
+
+ * 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
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=28926a1be178dd3b5811219e32b0d6b937bf21cf
commit 28926a1be178dd3b5811219e32b0d6b937bf21cf
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Jan 7 10:37:50 2012 -0500
Add explicit declaration of gets in C++ code
diff --git a/ChangeLog b/ChangeLog
index 3c76249..cafa830 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-01-07 Ulrich Drepper <drepper@gmail.com>
+ * elf/tst-unique3.cc: Add explicit declaration of gets.
+ * elf/tst-unique3lib.cc: Likewise.
+ * elf/tst-unique3lib2.cc: Likewise.
+ * elf/tst-unique4.cc: Likewise.
+
* string/test-strcpy.c (do_one_test): Fix format string for WIDE use.
2012-01-03 Ulrich Drepper <drepper@gmail.com>
diff --git a/elf/tst-unique3.cc b/elf/tst-unique3.cc
index b2c9593..ec1e814 100644
--- a/elf/tst-unique3.cc
+++ b/elf/tst-unique3.cc
@@ -1,4 +1,6 @@
#include "tst-unique3.h"
+extern char *gets (char *);
+
#include <cstdio>
#include "../dlfcn/dlfcn.h"
diff --git a/elf/tst-unique3lib.cc b/elf/tst-unique3lib.cc
index fa8e85a..5429dc5 100644
--- a/elf/tst-unique3lib.cc
+++ b/elf/tst-unique3lib.cc
@@ -1,3 +1,5 @@
+extern char *gets (char *);
+
#include <cstdio>
#include "tst-unique3.h"
template<typename T> int S<T>::i = 1;
diff --git a/elf/tst-unique3lib2.cc b/elf/tst-unique3lib2.cc
index 17d817e..76dadca 100644
--- a/elf/tst-unique3lib2.cc
+++ b/elf/tst-unique3lib2.cc
@@ -1,3 +1,5 @@
+extern char *gets (char *);
+
#include <cstdio>
#include "tst-unique3.h"
diff --git a/elf/tst-unique4.cc b/elf/tst-unique4.cc
index 9eaa909..e38ae83 100644
--- a/elf/tst-unique4.cc
+++ b/elf/tst-unique4.cc
@@ -1,5 +1,7 @@
// BZ 12511
#include "tst-unique4.h"
+extern char *gets (char *);
+
#include <cstdio>
static int a[24] =
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=df78418ad7f16500fb52f3075aada0ed9e22abe2
commit df78418ad7f16500fb52f3075aada0ed9e22abe2
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Jan 7 08:54:34 2012 -0500
Fix problem with reuse of test-strcpy for wide char testing
diff --git a/ChangeLog b/ChangeLog
index f31cc94..3c76249 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-07 Ulrich Drepper <drepper@gmail.com>
+
+ * string/test-strcpy.c (do_one_test): Fix format string for WIDE use.
+
2012-01-03 Ulrich Drepper <drepper@gmail.com>
* iconv/loop.c (single loop): Fix assertion in storing of
diff --git a/string/test-strcpy.c b/string/test-strcpy.c
index 01a46de..04d9897 100644
--- a/string/test-strcpy.c
+++ b/string/test-strcpy.c
@@ -1,5 +1,5 @@
/* Test and measure strcpy functions.
- Copyright (C) 1999, 2002, 2003, 2005, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2003, 2005, 2011, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
Added wcscpy support by Liubov Dmitrieva <liubov.dmitrieva@gmail.com>, 2011
@@ -23,6 +23,7 @@
# include <wchar.h>
# define CHAR wchar_t
# define UCHAR wchar_t
+# define sfmt "ls"
# define BIG_CHAR WCHAR_MAX
# define SMALL_CHAR 1273
# define STRCMP wcscmp
@@ -31,6 +32,7 @@
#else
# define CHAR char
# define UCHAR unsigned char
+# define sfmt "s"
# define BIG_CHAR CHAR_MAX
# define SMALL_CHAR 127
# define STRCMP strcmp
@@ -80,7 +82,8 @@ do_one_test (impl_t *impl, CHAR *dst, const CHAR *src,
if (STRCMP (dst, src) != 0)
{
- error (0, 0, "Wrong result in function %s dst \"%s\" src \"%s\"",
+ error (0, 0,
+ "Wrong result in function %s dst \"%" sfmt "\" src \"%" sfmt "\"",
impl->name, dst, src);
ret = 1;
return;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 11 +++++++++++
elf/tst-unique3.cc | 2 ++
elf/tst-unique3lib.cc | 2 ++
elf/tst-unique3lib2.cc | 2 ++
elf/tst-unique4.cc | 2 ++
libio/stdio.h | 2 +-
string/test-strcpy.c | 7 +++++--
7 files changed, 25 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources