* Replaced ALIGN macro with PAD

* Moved ALIGN16 macro from tr_local.h to ALIGN in q_shared.h

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 );

code/qcommon/q_shared.h

@@ -111,7 +111,13 @@ typedef int		sfxHandle_t;
 typedef int		fileHandle_t;
 typedef int		clipHandle_t;
 
-#define ALIGN(x) ((x+sizeof(long)-1) & ~(sizeof(long)-1))
+#define PAD(x,y) (((x)+(y)-1) & ~((y)-1))
+
+#ifdef __GNUC__
+#define ALIGN(x) __attribute__((aligned(x)))
+#else
+#define ALIGN(x)
+#endif
 
 #ifndef NULL
 #define NULL ((void *)0)