summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-05-27 20:11:16 +0000
committerEric Andersen <andersen@codepoet.org>2003-05-27 20:11:16 +0000
commit26c58a51818b36d94421da32c073536ab6693fd6 (patch)
tree4cbf059f834c140c8286de5316ff387727574d3e
parent064a669c923a0052f7d066ade22cd0c7e27602aa (diff)
Change 'N' to '__size' to avoid conflicts with common #define of N
-rw-r--r--include/stdlib.h10
1 files 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