From afe2e0efd9c4dfa8b4e4426fc6ca5a44c231314f Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 15 Jan 2006 12:55:00 +0000 Subject: [PATCH] The OS X 10.4u SDK defines ALIGN(p) as (((unsigned int)(p) + ALIGNBYTES) &~ ALIGNBYTES) so use SM_ALIGN instead. --- stepmania/src/global.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/stepmania/src/global.h b/stepmania/src/global.h index bcdca40859..97877bab6e 100644 --- a/stepmania/src/global.h +++ b/stepmania/src/global.h @@ -127,12 +127,10 @@ void ShowWarning( const char *file, int line, const char *message ); // don't pu #define CONST_FUNCTION #endif -#if !defined(ALIGN) #if defined(__GNUC__) -#define ALIGN(n) __attribute__((aligned(n))) +#define SM_ALIGN(n) __attribute__((aligned(n))) #else -#define ALIGN(n) -#endif +#define SM_ALIGN(n) #endif