From 26c58a51818b36d94421da32c073536ab6693fd6 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Tue, 27 May 2003 20:11:16 +0000 Subject: Change 'N' to '__size' to avoid conflicts with common #define of N --- include/stdlib.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/stdlib.h b/include/stdlib.h index bc9cd6224..6de9eedeb 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -550,14 +550,14 @@ extern void *calloc (size_t __nmemb, size_t __size) /* Cope with autoconf's broken AC_FUNC_MALLOC macro, which * redefines malloc to rpl_malloc if it does not detect glibc * style returning-a-valid-pointer-for-malloc(0) behavior. This - * calls malloc() as usual, but if N is zero, we allocate and + * calls malloc() as usual, but if __size is zero, we allocate and * return a 1-byte block instead.... sigh... */ -static inline char * rpl_malloc (size_t N) +static __inline char * rpl_malloc (size_t __size) { - if (N == 0) { - N++; + if (__size == 0) { + __size++; } - return malloc (N); + return malloc(__size); } #endif -- cgit v1.2.3