RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
diego 2007-12-11 20:07:18 +00:00
parent b5fa2f008a
commit 17981e0ab6
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
liba52/imdct.c
View File

@ -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_s2 0x18,0x19,0x1a,0x1b
#define WORD_s3 0x1c,0x1d,0x1e,0x1f #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) #define vcprm(a,b,c,d) (const vector unsigned char)(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d)
#else #else
#define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d} #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_n -1.
#define FLOAT_p 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) #define vcii(a,b,c,d) (const vector float)(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d)
#else #else
#define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d} #define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d}
#endif #endif
#ifdef SYS_DARWIN #ifdef __APPLE_CC__
#define FOUROF(a) (a) #define FOUROF(a) (a)
#else #else
#define FOUROF(a) {a,a,a,a} #define FOUROF(a) {a,a,a,a}

6
liba52/liba52_changes.diff
View File

@ -1563,7 +1563,7 @@
+#define WORD_s2 0x18,0x19,0x1a,0x1b +#define WORD_s2 0x18,0x19,0x1a,0x1b
+#define WORD_s3 0x1c,0x1d,0x1e,0x1f +#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) +#define vcprm(a,b,c,d) (const vector unsigned char)(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d)
+#else +#else
+#define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d} +#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_n -1.
+#define FLOAT_p 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) +#define vcii(a,b,c,d) (const vector float)(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d)
+#else +#else
+#define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d} +#define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d}
+#endif +#endif
+ +
+#ifdef SYS_DARWIN +#ifdef __APPLE_CC__
+#define FOUROF(a) (a) +#define FOUROF(a) (a)
+#else +#else
+#define FOUROF(a) {a,a,a,a} +#define FOUROF(a) {a,a,a,a}

6
mp3lib/dct64_altivec.c
View File

@ -26,7 +26,7 @@
#define WORD_s2 0x18,0x19,0x1a,0x1b #define WORD_s2 0x18,0x19,0x1a,0x1b
#define WORD_s3 0x1c,0x1d,0x1e,0x1f #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) #define vcprm(a,b,c,d) (const vector unsigned char)(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d)
#else #else
#define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d} #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_n -1.
#define FLOAT_p 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) #define vcii(a,b,c,d) (const vector float)(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d)
#else #else
#define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d} #define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d}
#endif #endif
#ifdef SYS_DARWIN #ifdef __APPLE_CC__
#define FOUROF(a) (a) #define FOUROF(a) (a)
#else #else
#define FOUROF(a) {a,a,a,a} #define FOUROF(a) {a,a,a,a}