From cb6a88484ce0b5ffba2fe98a40e2d51f4af92eb8 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Sat, 25 Feb 2006 04:03:33 +0000 Subject: Merge from trunk. Going pretty good so far. Kind of. Okay, not really. --- libc/stdlib/malloc-standard/memalign.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libc/stdlib/malloc-standard/memalign.c') diff --git a/libc/stdlib/malloc-standard/memalign.c b/libc/stdlib/malloc-standard/memalign.c index bd9536272..27502893d 100644 --- a/libc/stdlib/malloc-standard/memalign.c +++ b/libc/stdlib/malloc-standard/memalign.c @@ -28,7 +28,7 @@ void* memalign(size_t alignment, size_t bytes) size_t nb; /* padded request size */ char* m; /* memory returned by malloc call */ mchunkptr p; /* corresponding chunk */ - char* brk; /* alignment point within p */ + char* _brk; /* alignment point within p */ mchunkptr newp; /* chunk to return */ size_t newsize; /* its size */ size_t leadsize; /* leading space before alignment point */ @@ -79,13 +79,13 @@ void* memalign(size_t alignment, size_t bytes) total room so that this is always possible. */ - brk = (char*)mem2chunk((unsigned long)(((unsigned long)(m + alignment - 1)) & + _brk = (char*)mem2chunk((unsigned long)(((unsigned long)(m + alignment - 1)) & -((signed long) alignment))); - if ((unsigned long)(brk - (char*)(p)) < MINSIZE) - brk += alignment; + if ((unsigned long)(_brk - (char*)(p)) < MINSIZE) + _brk += alignment; - newp = (mchunkptr)brk; - leadsize = brk - (char*)(p); + newp = (mchunkptr)_brk; + leadsize = _brk - (char*)(p); newsize = chunksize(p) - leadsize; /* For mmapped chunks, just adjust offset */ -- cgit v1.2.3