Rename CONFIG_DARWIN to SYS_DARWIN, it is not configurable (in FFmpeg).

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10190 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/configure b/configure
index a9a4fd74ee051c89ca463dd85caaf9c365e0f641..10c9c15f9b9b6bc077facb487a4fd65ef9a29b82 100755 (executable)
--- a/configure
+++ b/configure
@@ -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

diff --git a/ffplay.c b/ffplay.c
index ad5fd1c76f9a4618f73c6d4a211db1d0f3a3e011..cbbeb79d240c45c3e981b3dd309b91ddfc0941f8 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -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 2997251a75df09a13215cac977ab72981b6837f1..2b454656ebd41f7a5fe7f375cadc169adb3def40 100644 (file)
--- 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 700c9e6295cdbefd2c35a78788d38016dc12289d..34fdab1bcfd515437b0d8f97a115965c91879d3e 100644 (file)
--- 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 ff5fc68b359e3d5565eef8416ab0b51898325ba0..c96d49a1103e821d4426db27e131c62ebaba0323 100644 (file)
--- 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 b91e3a661511bed733bb663608fa906dbe63422c..50d78ee6a484364a67b22fb0feedc6a0173f5991 100644 (file)
--- 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 cf992e511f58eaef8e5026e0dd1acd6ad81ea228..1e05acc2e5127525ebfcf9585a3ffbc694628f6e 100644 (file)
--- 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 337f2970838ea252af6a19ec294e1ab9f1d98f5d..58c5aa86968f98c89dcf2e613096a9ecdd3ba0d2 100644 (file)
--- 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 6a76c0eb74c1e6347ccabe5f2a1264db4b94fa31..332c5bbdd4b74c26200826d87f36381d0ced4a1e 100644 (file)
--- 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}