diff options
| author | DJ Delorie <dj@delorie.com> | 2017-03-09 20:34:44 -0500 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2017-03-09 20:34:44 -0500 |
| commit | dad11d1aea27259d5a2ac2e4b6593cf653b49b3f (patch) | |
| tree | 9913ea0679f2536144d4f7edb703f52348ef7f9d /malloc | |
| parent | 33cb8b061cbf47ea8904bda49a311ca10a4299ac (diff) | |
| parent | b24d6d155062b6f3ecd7b0d55442079c941e59c0 (diff) | |
| download | glibc-dad11d1aea27259d5a2ac2e4b6593cf653b49b3f.zip glibc-dad11d1aea27259d5a2ac2e4b6593cf653b49b3f.tar.gz glibc-dad11d1aea27259d5a2ac2e4b6593cf653b49b3f.tar.bz2 | |
Merge branch 'master' into dj/malloc-tcache
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/arena.c | 8 | ||||
| -rw-r--r-- | malloc/malloc.c | 2 | ||||
| -rw-r--r-- | malloc/tst-interpose-aux.c | 1 | ||||
| -rw-r--r-- | malloc/tst-malloc.c | 2 | ||||
| -rw-r--r-- | malloc/tst-mcheck.c | 2 | ||||
| -rw-r--r-- | malloc/tst-realloc.c | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/malloc/arena.c b/malloc/arena.c index d115d35..79e918f 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -212,9 +212,9 @@ __malloc_fork_unlock_child (void) #if HAVE_TUNABLES static inline int do_set_mallopt_check (int32_t value); void -DL_TUNABLE_CALLBACK (set_mallopt_check) (void *valp) +DL_TUNABLE_CALLBACK (set_mallopt_check) (tunable_val_t *valp) { - int32_t value = *(int32_t *) valp; + int32_t value = (int32_t) valp->numval; do_set_mallopt_check (value); if (check_action != 0) __malloc_check_init (); @@ -223,9 +223,9 @@ DL_TUNABLE_CALLBACK (set_mallopt_check) (void *valp) # define DL_TUNABLE_CALLBACK_FNDECL(__name, __type) \ static inline int do_ ## __name (__type value); \ void \ -DL_TUNABLE_CALLBACK (__name) (void *valp) \ +DL_TUNABLE_CALLBACK (__name) (tunable_val_t *valp) \ { \ - __type value = *(__type *) valp; \ + __type value = (__type) (valp)->numval; \ do_ ## __name (value); \ } diff --git a/malloc/malloc.c b/malloc/malloc.c index 15d81b8..1343da4 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -237,7 +237,7 @@ #include <sys/param.h> /* For ALIGN_UP et. al. */ -#include <libc-internal.h> +#include <libc-pointer-arith.h> #include <malloc/malloc-internal.h> diff --git a/malloc/tst-interpose-aux.c b/malloc/tst-interpose-aux.c index 535b055..e80e979 100644 --- a/malloc/tst-interpose-aux.c +++ b/malloc/tst-interpose-aux.c @@ -21,6 +21,7 @@ #include <errno.h> #include <stdarg.h> #include <stddef.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/malloc/tst-malloc.c b/malloc/tst-malloc.c index 740ac6c..dbc8d4a 100644 --- a/malloc/tst-malloc.c +++ b/malloc/tst-malloc.c @@ -19,7 +19,7 @@ #include <errno.h> #include <malloc.h> #include <stdio.h> -#include <libc-internal.h> +#include <libc-diag.h> static int errors = 0; diff --git a/malloc/tst-mcheck.c b/malloc/tst-mcheck.c index 2e3cba9..5a66bab 100644 --- a/malloc/tst-mcheck.c +++ b/malloc/tst-mcheck.c @@ -19,7 +19,7 @@ #include <errno.h> #include <stdio.h> #include <stdlib.h> -#include <libc-internal.h> +#include <libc-diag.h> static int errors = 0; diff --git a/malloc/tst-realloc.c b/malloc/tst-realloc.c index 7f1f228..31a58bd 100644 --- a/malloc/tst-realloc.c +++ b/malloc/tst-realloc.c @@ -19,7 +19,7 @@ #include <malloc.h> #include <stdio.h> #include <string.h> -#include <libc-internal.h> +#include <libc-diag.h> static int errors = 0; |