diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | ffplay.c | 4 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 2 | ||||
| -rw-r--r-- | libavcodec/ppc/dsputil_altivec.c | 10 | ||||
| -rw-r--r-- | libavcodec/ppc/dsputil_altivec.h | 4 | ||||
| -rw-r--r-- | libavcodec/ppc/gcc_fixes.h | 4 | ||||
| -rw-r--r-- | libavcodec/ppc/mpegvideo_altivec.c | 2 | ||||
| -rw-r--r-- | libavutil/internal.h | 2 | ||||
| -rw-r--r-- | libpostproc/postprocess_altivec_template.c | 2 |
9 files changed, 16 insertions, 16 deletions
@@ -1975,7 +1975,7 @@ print_config CONFIG_ $TMPH config.mak $CONFIG_LIST \ $PROTOCOL_LIST \ if test "$targetos" = darwin; then - echo "#define CONFIG_DARWIN 1" >> $TMPH + echo "#define SYS_DARWIN 1" >> $TMPH fi echo "#define restrict $_restrict" >> $TMPH @@ -865,7 +865,7 @@ static int video_open(VideoState *is){ w = 640; h = 480; } -#ifndef CONFIG_DARWIN +#ifndef SYS_DARWIN screen = SDL_SetVideoMode(w, h, 0, flags); #else /* setting bits_per_pixel = 0 or 32 causes blank video on OS X */ @@ -2541,7 +2541,7 @@ int main(int argc, char **argv) video_disable = 1; } flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER; -#if !defined(__MINGW32__) && !defined(CONFIG_DARWIN) +#if !defined(__MINGW32__) && !defined(SYS_DARWIN) flags |= SDL_INIT_EVENTTHREAD; /* Not supported on win32 or darwin */ #endif if (SDL_Init (flags)) { diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 2997251a75..2b454656eb 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -554,7 +554,7 @@ extern int mm_flags; extern int mm_flags; -#if defined(HAVE_ALTIVEC) && !defined(CONFIG_DARWIN) +#if defined(HAVE_ALTIVEC) && !defined(SYS_DARWIN) #define pixel altivec_pixel #include <altivec.h> #undef pixel diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c index 700c9e6295..34fdab1bcf 100644 --- a/libavcodec/ppc/dsputil_altivec.c +++ b/libavcodec/ppc/dsputil_altivec.c @@ -26,7 +26,7 @@ #include "dsputil_altivec.h" -#ifdef CONFIG_DARWIN +#ifdef SYS_DARWIN #include <sys/sysctl.h> #elif __AMIGAOS4__ #include <exec/exec.h> @@ -49,7 +49,7 @@ static void sigill_handler (int sig) canjump = 0; siglongjmp (jmpbuf, 1); } -#endif /* CONFIG_DARWIN */ +#endif /* SYS_DARWIN */ int sad16_x2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) { @@ -1428,7 +1428,7 @@ int has_altivec(void) return 0; #else /* __AMIGAOS4__ */ -#ifdef CONFIG_DARWIN +#ifdef SYS_DARWIN int sels[2] = {CTL_HW, HW_VECTORUNIT}; int has_vu = 0; size_t len = sizeof(has_vu); @@ -1437,7 +1437,7 @@ int has_altivec(void) err = sysctl(sels, 2, &has_vu, &len, NULL, 0); if (err == 0) return (has_vu != 0); -#else /* CONFIG_DARWIN */ +#else /* SYS_DARWIN */ /* no Darwin, do it the brute-force way */ /* this is borrowed from the libmpeg2 library */ { @@ -1456,7 +1456,7 @@ int has_altivec(void) return 1; } } -#endif /* CONFIG_DARWIN */ +#endif /* SYS_DARWIN */ return 0; #endif /* __AMIGAOS4__ */ } diff --git a/libavcodec/ppc/dsputil_altivec.h b/libavcodec/ppc/dsputil_altivec.h index ff5fc68b35..c96d49a110 100644 --- a/libavcodec/ppc/dsputil_altivec.h +++ b/libavcodec/ppc/dsputil_altivec.h @@ -44,7 +44,7 @@ void avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, #define WORD_s2 0x18,0x19,0x1a,0x1b #define WORD_s3 0x1c,0x1d,0x1e,0x1f -#ifdef CONFIG_DARWIN +#ifdef SYS_DARWIN #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} @@ -61,7 +61,7 @@ void avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, #define FLOAT_p 1. -#ifdef CONFIG_DARWIN +#ifdef SYS_DARWIN #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} diff --git a/libavcodec/ppc/gcc_fixes.h b/libavcodec/ppc/gcc_fixes.h index b91e3a6615..50d78ee6a4 100644 --- a/libavcodec/ppc/gcc_fixes.h +++ b/libavcodec/ppc/gcc_fixes.h @@ -27,7 +27,7 @@ #include <altivec.h> #endif -#ifdef CONFIG_DARWIN +#ifdef SYS_DARWIN # ifndef __MWERKS__ # define AVV(x...) (x) # else @@ -108,7 +108,7 @@ __ch (__bin_args_eq (vector unsigned int, (a1), vector unsigned int, (a2)), \ #endif -#endif /* CONFIG_DARWIN */ +#endif /* SYS_DARWIN */ #ifndef __MWERKS__ #define const_vector const vector diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c index cf992e511f..1e05acc2e5 100644 --- a/libavcodec/ppc/mpegvideo_altivec.c +++ b/libavcodec/ppc/mpegvideo_altivec.c @@ -66,7 +66,7 @@ do { \ } -#ifdef CONFIG_DARWIN +#ifdef SYS_DARWIN #define FOUROF(a) (a) #else // slower, for dumb non-apple GCC diff --git a/libavutil/internal.h b/libavutil/internal.h index 337f297083..58c5aa8696 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -121,7 +121,7 @@ #else # if defined(ARCH_X86_64) && defined(PIC) # define MANGLE(a) #a"(%%rip)" -# elif defined(CONFIG_DARWIN) +# elif defined(SYS_DARWIN) # define MANGLE(a) "_" #a # else # define MANGLE(a) #a diff --git a/libpostproc/postprocess_altivec_template.c b/libpostproc/postprocess_altivec_template.c index 6a76c0eb74..332c5bbdd4 100644 --- a/libpostproc/postprocess_altivec_template.c +++ b/libpostproc/postprocess_altivec_template.c @@ -22,7 +22,7 @@ #include "avutil.h" -#ifdef CONFIG_DARWIN +#ifdef SYS_DARWIN #define AVV(x...) (x) #else #define AVV(x...) {x} |