diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-11 20:07:18 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-11 20:07:18 +0000 |
| commit | 17981e0ab6d90f19352615f47f352df7992a6f1c (patch) | |
| tree | 0aac08ebbd9e174105ca5211a1e8cafec4c9bbd7 /liba52 | |
| parent | b5fa2f008ac3c9af92a0b26e11b995c419755447 (diff) | |
| download | mpv-17981e0ab6d90f19352615f47f352df7992a6f1c.tar.bz2 mpv-17981e0ab6d90f19352615f47f352df7992a6f1c.tar.xz | |
Replace SYS_DARWIN conditional directive around gcc macros by __APPLE_CC__.
The macro definition depends on compiler capabilities, not OS features.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25355 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'liba52')
| -rw-r--r-- | liba52/imdct.c | 6 | ||||
| -rw-r--r-- | liba52/liba52_changes.diff | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/liba52/imdct.c b/liba52/imdct.c index aa4a82547d..686252dfea 100644 --- a/liba52/imdct.c +++ b/liba52/imdct.c @@ -382,7 +382,7 @@ void imdct_do_512 (sample_t * data, sample_t * delay, sample_t bias) #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, sample_t * delay, sample_t bias) #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} diff --git a/liba52/liba52_changes.diff b/liba52/liba52_changes.diff index b238d613d0..76ae4a9453 100644 --- a/liba52/liba52_changes.diff +++ b/liba52/liba52_changes.diff @@ -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} |