summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--stdio-common/tst-printfsz.c7
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 04804b077b..1014ba3dff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-12-10 Joseph Myers <joseph@codesourcery.com>
+ * stdio-common/tst-printfsz.c: Include <libc-internal.h>.
+ (main): Disable -Wdeprecated-declarations around calls to
+ register_printf_function.
+
* stdio-common/tst-unlockedio.c: Include <libc-internal.h>.
(do_test): Disable -Wdiv-by-zero around some calls to
fwrite_unlocked and fread_unlocked.
diff --git a/stdio-common/tst-printfsz.c b/stdio-common/tst-printfsz.c
index 5925050b59..74d67d2f69 100644
--- a/stdio-common/tst-printfsz.c
+++ b/stdio-common/tst-printfsz.c
@@ -2,6 +2,7 @@
#include <printf.h>
#include <stdio.h>
#include <string.h>
+#include <libc-internal.h>
#define V 12345678.12345678
@@ -12,9 +13,15 @@ main (int argc, char *argv[])
char buf[1024];
int result = 0;
+ /* Testing printf_size_info requires using the deprecated
+ register_printf_function, resulting in warnings
+ "'register_printf_function' is deprecated". */
+ DIAG_PUSH_NEEDS_COMMENT;
+ DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wdeprecated-declarations");
/* Register the printf handlers. */
register_printf_function ('b', printf_size, printf_size_info);
register_printf_function ('B', printf_size, printf_size_info);
+ DIAG_POP_NEEDS_COMMENT;
sprintf (buf, "%g %b %B %.0b %.0B %.1b %.1B %8.0b %08.0B",