From 65f936402d0dd0e62191ed249f86946203476e28 Mon Sep 17 00:00:00 2001 From: Tommi Rantala Date: Fri, 21 Sep 2012 09:29:16 +0300 Subject: [PATCH] Add arguments to malloc and calloc prototypes in Ltest-nocalloc --- tests/Ltest-nocalloc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Ltest-nocalloc.c b/tests/Ltest-nocalloc.c index 155cce39..fb0c9811 100644 --- a/tests/Ltest-nocalloc.c +++ b/tests/Ltest-nocalloc.c @@ -40,17 +40,17 @@ int in_unwind; void * calloc(size_t n, size_t s) { - static void * (*func)(); + static void * (*func)(size_t, size_t); #ifdef __GLIBC__ /* In glibc, dlsym() calls calloc. Calling dlsym(RTLD_NEXT, "calloc") here causes infinite recursion. Instead, we simply use it by its other name. */ - extern void *__libc_calloc(); + extern void *__libc_calloc(size_t, size_t); func = &__libc_calloc; #else if(!func) - func = (void *(*)()) dlsym(RTLD_NEXT, "calloc"); + func = dlsym(RTLD_NEXT, "calloc"); #endif if (in_unwind) { @@ -64,10 +64,10 @@ calloc(size_t n, size_t s) void * malloc(size_t s) { - static void * (*func)(); + static void * (*func)(size_t); if(!func) - func = (void *(*)()) dlsym(RTLD_NEXT, "malloc"); + func = dlsym(RTLD_NEXT, "malloc"); if (in_unwind) { num_mallocs++;