Author: diego Date: Tue Dec 11 21:07:18 2007 New Revision: 25355 Log: Replace SYS_DARWIN conditional directive around gcc macros by __APPLE_CC__. The macro definition depends on compiler capabilities, not OS features. Modified: trunk/liba52/imdct.c trunk/liba52/liba52_changes.diff trunk/mp3lib/dct64_altivec.c Modified: trunk/liba52/imdct.c ============================================================================== --- trunk/liba52/imdct.c (original) +++ trunk/liba52/imdct.c Tue Dec 11 21:07:18 2007 @@ -382,7 +382,7 @@ void imdct_do_512 (sample_t * data, samp #define WORD_s2 0x18,0x19,0x1a,0x1b #define WORD_s3 0x1c,0x1d,0x1e,0x1f -#ifdef SYS_DARWIN +#ifdef __APPLE_CC__ #define vcprm(a,b,c,d) (const vector unsigned char)(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d) #else #define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d} @@ -398,13 +398,13 @@ void imdct_do_512 (sample_t * data, samp #define FLOAT_n -1. #define FLOAT_p 1. -#ifdef SYS_DARWIN +#ifdef __APPLE_CC__ #define vcii(a,b,c,d) (const vector float)(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d) #else #define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d} #endif -#ifdef SYS_DARWIN +#ifdef __APPLE_CC__ #define FOUROF(a) (a) #else #define FOUROF(a) {a,a,a,a} Modified: trunk/liba52/liba52_changes.diff ============================================================================== --- trunk/liba52/liba52_changes.diff (original) +++ trunk/liba52/liba52_changes.diff Tue Dec 11 21:07:18 2007 @@ -1563,7 +1563,7 @@ +#define WORD_s2 0x18,0x19,0x1a,0x1b +#define WORD_s3 0x1c,0x1d,0x1e,0x1f + -+#ifdef SYS_DARWIN ++#ifdef __APPLE_CC__ +#define vcprm(a,b,c,d) (const vector unsigned char)(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d) +#else +#define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d} @@ -1579,13 +1579,13 @@ +#define FLOAT_n -1. +#define FLOAT_p 1. + -+#ifdef SYS_DARWIN ++#ifdef __APPLE_CC__ +#define vcii(a,b,c,d) (const vector float)(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d) +#else +#define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d} +#endif + -+#ifdef SYS_DARWIN ++#ifdef __APPLE_CC__ +#define FOUROF(a) (a) +#else +#define FOUROF(a) {a,a,a,a} Modified: trunk/mp3lib/dct64_altivec.c ============================================================================== --- trunk/mp3lib/dct64_altivec.c (original) +++ trunk/mp3lib/dct64_altivec.c Tue Dec 11 21:07:18 2007 @@ -26,7 +26,7 @@ #define WORD_s2 0x18,0x19,0x1a,0x1b #define WORD_s3 0x1c,0x1d,0x1e,0x1f -#ifdef SYS_DARWIN +#ifdef __APPLE_CC__ #define vcprm(a,b,c,d) (const vector unsigned char)(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d) #else #define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d} @@ -42,13 +42,13 @@ #define FLOAT_n -1. #define FLOAT_p 1. -#ifdef SYS_DARWIN +#ifdef __APPLE_CC__ #define vcii(a,b,c,d) (const vector float)(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d) #else #define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d} #endif -#ifdef SYS_DARWIN +#ifdef __APPLE_CC__ #define FOUROF(a) (a) #else #define FOUROF(a) {a,a,a,a}