[uClibc-cvs] uClibc/libc/stdlib/malloc-simple alloc.c,1.14,1.15

Erik Andersen andersen at uclibc.org
Fri Jan 16 13:43:10 UTC 2004


Update of /var/cvs/uClibc/libc/stdlib/malloc-simple
In directory nail:/home/andersen/CVS/uClibc/libc/stdlib/malloc-simple

Modified Files:
	alloc.c 
Log Message:
s/UCLIBC_HAS_MMU/ARCH_HAS_MMU/g


Index: alloc.c
===================================================================
RCS file: /var/cvs/uClibc/libc/stdlib/malloc-simple/alloc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- alloc.c	14 Jan 2004 22:37:55 -0000	1.14
+++ alloc.c	16 Jan 2004 13:43:08 -0000	1.15
@@ -31,7 +31,7 @@
 #endif
     }
 
-#ifdef __UCLIBC_HAS_MMU__
+#ifdef __ARCH_HAS_MMU__
     result = mmap((void *) 0, size + sizeof(size_t), PROT_READ | PROT_WRITE,
 	    MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
     if (result == MAP_FAILED)
@@ -88,7 +88,7 @@
     newptr = malloc(size);
     if (newptr) {
 	memcpy(newptr, ptr,
-#ifdef __UCLIBC_HAS_MMU__
+#ifdef __ARCH_HAS_MMU__
 		*((size_t *) (ptr - sizeof(size_t)))
 #else
 		size
@@ -111,7 +111,7 @@
 	    return;
 	}
     }
-#ifdef __UCLIBC_HAS_MMU__
+#ifdef __ARCH_HAS_MMU__
     ptr -= sizeof(size_t);
     munmap(ptr, * (size_t *) ptr + sizeof(size_t));
 #else
@@ -154,7 +154,7 @@
 	    /* Mark the block as free */
 	    l->aligned = NULL;
 	    ptr = l->exact;
-#ifdef __UCLIBC_HAS_MMU__
+#ifdef __ARCH_HAS_MMU__
 	    ptr -= sizeof(size_t);
 	    munmap(ptr, * (size_t *) ptr + sizeof(size_t));
 #else




More information about the uClibc-cvs mailing list