From 1fa5872b59f24cb05e82c4124ddb455834dd9f37 Mon Sep 17 00:00:00 2001 From: tma Date: Mon, 5 Dec 2005 17:32:54 +0000 Subject: * Replaced ALIGN macro with PAD * Moved ALIGN16 macro from tr_local.h to ALIGN in q_shared.h git-svn-id: svn://svn.icculus.org/quake3/trunk@417 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/qcommon/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'code/qcommon/common.c') diff --git a/code/qcommon/common.c b/code/qcommon/common.c index 3839f7b..b9de067 100644 --- a/code/qcommon/common.c +++ b/code/qcommon/common.c @@ -929,7 +929,7 @@ void *Z_TagMalloc( int size, int tag ) { // size += sizeof(memblock_t); // account for size of block header size += 4; // space for memory trash tester - size = ALIGN(size); // align to 32/64 bit boundary + size = PAD(size, sizeof(long)); // align to 32/64 bit boundary base = rover = zone->rover; start = base->prev; @@ -1746,7 +1746,7 @@ void *Hunk_AllocateTempMemory( int size ) { Hunk_SwapBanks(); - size = ALIGN(size) + sizeof( hunkHeader_t ); + size = PAD(size, sizeof(long)) + sizeof( hunkHeader_t ); if ( hunk_temp->temp + hunk_permanent->permanent + size > s_hunkTotal ) { Com_Error( ERR_DROP, "Hunk_AllocateTempMemory: failed on %i", size ); -- cgit v1.2.3