浏览代码

Change 'N' to '__size' to avoid conflicts with common #define of N

Eric Andersen 22 年之前
父节点
当前提交
26c58a5181
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      include/stdlib.h

+ 5 - 5
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
 /* Cope with autoconf's broken AC_FUNC_MALLOC macro, which
  * redefines malloc to rpl_malloc if it does not detect glibc
  * redefines malloc to rpl_malloc if it does not detect glibc
  * style returning-a-valid-pointer-for-malloc(0) behavior.  This
  * 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... */ 
  * 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) {
+    if (__size == 0) {
-	N++; 
+	__size++; 
     }
     }
-    return malloc (N);
+    return malloc(__size);
 }   
 }   
 #endif
 #endif