Mercurial > mplayer.hg
diff libmpeg2/libmpeg-0.4.1.diff @ 25980:11181df06389
Do not check for __APPLE_ALTIVEC__, just check for __APPLE_CC__.
This should work even when -faltivec is not specified.
| author | diego |
|---|---|
| date | Sat, 16 Feb 2008 17:44:49 +0000 |
| parents | 1769eb14d6e8 |
| children | dfdf201e62cc |
line wrap: on
line diff
--- a/libmpeg2/libmpeg-0.4.1.diff Sat Feb 16 15:34:19 2008 +0000 +++ b/libmpeg2/libmpeg-0.4.1.diff Sat Feb 16 17:44:49 2008 +0000 @@ -72,7 +72,7 @@ -#ifdef HAVE_ALTIVEC_H /* gnu */ -#define VAND(a,b,c) "vand " #a "," #b "," #c "\n\t" -#else /* apple */ -+#if defined( __APPLE_CC__ ) && defined( __APPLE_ALTIVEC__ ) /* apple */ ++#if defined(__APPLE_CC__) /* apple */ #define VAND(a,b,c) "vand v" #a ",v" #b ",v" #c "\n\t" +#else /* gnu */ +#define VAND(a,b,c) "vand " #a "," #b "," #c "\n\t" @@ -137,7 +137,7 @@ -#define LVX0(a,b,c) "lvx " #a ",0," #c "\n\t" -#define LVX(a,b,c) "lvx " #a "," #b "," #c "\n\t" -#else /* apple */ -+#if defined( __APPLE_CC__ ) && defined( __APPLE_ALTIVEC__ ) /* apple */ ++#if defined(__APPLE_CC__) /* apple */ #define LI(a,b) "li r" #a "," #b "\n\t" #define STVX0(a,b,c) "stvx v" #a ",0,r" #c "\n\t" #define STVX(a,b,c) "stvx v" #a ",r" #b ",r" #c "\n\t" @@ -464,7 +464,7 @@ typedef vector unsigned int vector_u32_t; -#if defined(HAVE_ALTIVEC_H) && (__GNUC__ * 100 + __GNUC_MINOR__ < 303) -+#if defined( HAVE_ALTIVEC_H ) && !defined( __APPLE_ALTIVEC__ ) && (__GNUC__ * 100 + __GNUC_MINOR__ < 303) ++#if defined(HAVE_ALTIVEC_H) && !defined(__APPLE_CC__) && (__GNUC__ * 100 + __GNUC_MINOR__ < 303) /* work around gcc <3.3 vec_mergel bug */ static inline vector_s16_t my_vec_mergel (vector_s16_t const A, vector_s16_t const B) @@ -475,7 +475,7 @@ -#ifdef HAVE_ALTIVEC_H /* gnu */ -#define VEC_S16(a,b,c,d,e,f,g,h) {a, b, c, d, e, f, g, h} -#else /* apple */ -+#if defined( __APPLE_CC__ ) && defined( __APPLE_ALTIVEC__ ) /* apple */ ++#if defined(__APPLE_CC__) /* apple */ #define VEC_S16(a,b,c,d,e,f,g,h) (vector_s16_t) (a, b, c, d, e, f, g, h) +#else /* gnu */ +#define VEC_S16(a,b,c,d,e,f,g,h) {a, b, c, d, e, f, g, h}