diff options
| author | Simon Howard | 2010-09-09 23:13:06 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-09-09 23:13:06 +0000 |
| commit | 120d90c67b2a4aa0a8883c4897241dee2222acd2 (patch) | |
| tree | b439e48483ebbd698c2daa6e24eeaaab1ba97470 /src/z_zone.c | |
| parent | 79268587fc730e17cbd974a5583c7185604b59a3 (diff) | |
| parent | 22fc405736dc4796958de221c07d52432f1b271b (diff) | |
| download | chocolate-doom-120d90c67b2a4aa0a8883c4897241dee2222acd2.tar.gz chocolate-doom-120d90c67b2a4aa0a8883c4897241dee2222acd2.tar.bz2 chocolate-doom-120d90c67b2a4aa0a8883c4897241dee2222acd2.zip | |
Merge from raven-branch.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2051
Diffstat (limited to 'src/z_zone.c')
| -rw-r--r-- | src/z_zone.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/z_zone.c b/src/z_zone.c index a3900f5b..c7425290 100644 --- a/src/z_zone.c +++ b/src/z_zone.c @@ -41,6 +41,7 @@ // because it will get overwritten automatically if needed. // +#define MEM_ALIGN sizeof(void *) #define ZONEID 0x1d4a11 typedef struct memblock_s @@ -201,7 +202,7 @@ Z_Malloc memblock_t* base; void *result; - size = (size + 3) & ~3; + size = (size + MEM_ALIGN - 1) & ~(MEM_ALIGN - 1); // scan through the block list, // looking for the first free block |