diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | elf/tst-unique3.cc | 2 | ||||
| -rw-r--r-- | elf/tst-unique3lib.cc | 2 | ||||
| -rw-r--r-- | elf/tst-unique3lib2.cc | 2 | ||||
| -rw-r--r-- | elf/tst-unique4.cc | 2 | ||||
| -rw-r--r-- | string/test-strcpy.c | 7 |
6 files changed, 22 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index da900aa600..8f9558c565 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +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] diff --git a/elf/tst-unique3.cc b/elf/tst-unique3.cc index b2c95939a5..ec1e814b18 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 fa8e85a36c..5429dc57c0 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 17d817e12e..76dadcaae7 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 9eaa909986..e38ae83748 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] = diff --git a/string/test-strcpy.c b/string/test-strcpy.c index 01a46de3c3..04d9897b67 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; |