diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-08-31 11:14:01 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-08-31 14:22:06 -0300 |
commit | 30e5069c7d4b51288d3e6f75f53a6ad2f5e71b0f (patch) | |
tree | 8239f1fe135d1374cb8109b8f7c1152f46038dbf /malloc/tst-mxfast.c | |
parent | 306bdd99834204d0d70985c39382d2c42a619a09 (diff) | |
download | glibc-30e5069c7d4b51288d3e6f75f53a6ad2f5e71b0f.tar.gz glibc-30e5069c7d4b51288d3e6f75f53a6ad2f5e71b0f.tar.xz glibc-30e5069c7d4b51288d3e6f75f53a6ad2f5e71b0f.zip |
malloc: Fix mallinfo deprecation declaration
It fixes the build issue below introduced by e3960d1c57e57 (Add mallinfo2 function that support sizes >= 4GB). It moves the __MALLOC_DEPRECATED to the usual place for function attributes: In file included from ../include/malloc.h:3, from ../sysdeps/x86_64/multiarch/../../../test-skeleton.c:31, from ../sysdeps/x86_64/multiarch/test-multiarch.c:96: ../malloc/malloc.h:118:1: error: empty declaration [-Werror] 118 | __MALLOC_DEPRECATED; It also adds the required deprecated warning suppression on the tests. Checked on x86_64-linux-gnu.
Diffstat (limited to 'malloc/tst-mxfast.c')
-rw-r--r-- | malloc/tst-mxfast.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/malloc/tst-mxfast.c b/malloc/tst-mxfast.c index 57b4a0a8dc..8afee0f9d5 100644 --- a/malloc/tst-mxfast.c +++ b/malloc/tst-mxfast.c @@ -21,6 +21,7 @@ the fast bins. */ #include <malloc.h> +#include <libc-diag.h> #include <support/check.h> int @@ -36,8 +37,14 @@ do_test (void) p2 = malloc (512); free (p1); + /* The test below covers the deprecated mallinfo function. */ + DIAG_PUSH_NEEDS_COMMENT; + DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wdeprecated-declarations"); + m = mallinfo (); + DIAG_POP_NEEDS_COMMENT; + /* This will fail if there are any blocks in the fastbins. */ TEST_COMPARE (m.smblks, 0); |