[uClibc-cvs] uClibc/include stdlib.h,1.36,1.37

Erik Andersen andersen at uclibc.org
Tue May 27 20:11:19 UTC 2003


Update of /var/cvs/uClibc/include
In directory winder:/tmp/cvs-serv25211/include

Modified Files:
	stdlib.h 
Log Message:
Change 'N' to '__size' to avoid conflicts with common #define of N


Index: stdlib.h
===================================================================
RCS file: /var/cvs/uClibc/include/stdlib.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- stdlib.h	23 May 2003 06:42:53 -0000	1.36
+++ stdlib.h	27 May 2003 20:11:16 -0000	1.37
@@ -550,14 +550,14 @@
 /* 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
 



More information about the uClibc-cvs mailing list