mirror of
https://github.com/NLnetLabs/unbound.git
synced 2026-02-03 20:29:28 -05:00
1c58ce0791
See more details: http://errors.yoctoproject.org/Errors/Details/850313 ../git/compat/malloc.c:9:7: warning: conflicting types for built-in function 'malloc'; expected 'void *(long unsigned int)' [-Wbuiltin-declaration-mismatch] 9 | void *malloc (); | ^~~~~~ ../git/compat/malloc.c:5:1: note: 'malloc' is declared in header '<stdlib.h>' 4 | #include "config.h" +++ |+#include <stdlib.h> 5 | #undef malloc ../git/compat/malloc.c: In function 'rpl_malloc_unbound': ../git/compat/malloc.c:23:10: error: too many arguments to function 'malloc'; expected 0, have 1 23 | return malloc (n); | ^~~~~~ ~ ../git/compat/malloc.c:9:7: note: declared here 9 | void *malloc (); | ^~~~~~ * Seeing that there is '#undef malloc', it appears they don't want to use the malloc from stdlib.h. Therefore, we need to correctly define the parameters for malloc. Signed-off-by: mark.yang <mark.yang@lge.com>
24 lines
458 B
C
24 lines
458 B
C
/* Just a replacement, if the original malloc is not
|
|
GNU-compliant. See autoconf documentation. */
|
|
|
|
#include "config.h"
|
|
#undef malloc
|
|
#include <sys/types.h>
|
|
|
|
#ifndef USE_WINSOCK
|
|
void *malloc (size_t n);
|
|
#else
|
|
/* provide a prototype */
|
|
void *malloc (size_t n);
|
|
#endif
|
|
|
|
/* Allocate an N-byte block of memory from the heap.
|
|
If N is zero, allocate a 1-byte block. */
|
|
|
|
void *
|
|
rpl_malloc_unbound (size_t n)
|
|
{
|
|
if (n == 0)
|
|
n = 1;
|
|
return malloc (n);
|
|
}
|