[FFmpeg-cvslog] r10247 - in trunk: ffplay.c libavcodec/ppc/dsputil_altivec.c libavutil/internal.h

[diego]

Author: diego
Date: Mon Aug 27 11:17:03 2007
New Revision: 10247

Log:
Change SYS_DARWIN preprocessor checks to __APPLE__, they are specific
to Mac OS X rather than to Darwin.


Modified:
   trunk/ffplay.c
   trunk/libavcodec/ppc/dsputil_altivec.c
   trunk/libavutil/internal.h

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	(original)
+++ trunk/ffplay.c	Mon Aug 27 11:17:03 2007
@@ -865,7 +865,7 @@ static int video_open(VideoState *is){
         w = 640;
         h = 480;
     }
-#ifndef SYS_DARWIN
+#ifndef __APPLE__
     screen = SDL_SetVideoMode(w, h, 0, flags);
 #else
     /* setting bits_per_pixel = 0 or 32 causes blank video on OS X */
@@ -2520,8 +2520,8 @@ int main(int argc, char **argv)
         video_disable = 1;
     }
     flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
-#if !defined(__MINGW32__) && !defined(SYS_DARWIN)
-    flags |= SDL_INIT_EVENTTHREAD; /* Not supported on win32 or darwin */
+#if !defined(__MINGW32__) && !defined(__APPLE__)
+    flags |= SDL_INIT_EVENTTHREAD; /* Not supported on Windows or Mac OS X */
 #endif
     if (SDL_Init (flags)) {
         fprintf(stderr, "Could not initialize SDL - %s\n", SDL_GetError());

Modified: trunk/libavcodec/ppc/dsputil_altivec.c
==============================================================================
--- trunk/libavcodec/ppc/dsputil_altivec.c	(original)
+++ trunk/libavcodec/ppc/dsputil_altivec.c	Mon Aug 27 11:17:03 2007
@@ -26,7 +26,7 @@
 
 #include "dsputil_altivec.h"
 
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
 #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 /* SYS_DARWIN */
+#endif /* __APPLE__ */
 
 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 SYS_DARWIN
+#ifdef __APPLE__
     int sels[2] = {CTL_HW, HW_VECTORUNIT};
     int has_vu = 0;
     size_t len = sizeof(has_vu);
@@ -1437,8 +1437,8 @@ int has_altivec(void)
     err = sysctl(sels, 2, &has_vu, &len, NULL, 0);
 
     if (err == 0) return (has_vu != 0);
-#else /* SYS_DARWIN */
-/* no Darwin, do it the brute-force way */
+#else /* __APPLE__ */
+/* no Mac OS X, do it the brute-force way */
 /* this is borrowed from the libmpeg2 library */
     {
       signal (SIGILL, sigill_handler);
@@ -1456,7 +1456,7 @@ int has_altivec(void)
         return 1;
       }
     }
-#endif /* SYS_DARWIN */
+#endif /* __APPLE__ */
     return 0;
 #endif /* __AMIGAOS4__ */
 }

Modified: trunk/libavutil/internal.h
==============================================================================
--- trunk/libavutil/internal.h	(original)
+++ trunk/libavutil/internal.h	Mon Aug 27 11:17:03 2007
@@ -128,7 +128,7 @@
 #else
 #    if defined(ARCH_X86_64) && defined(PIC)
 #        define MANGLE(a) #a"(%%rip)"
-#    elif defined(SYS_DARWIN)
+#    elif defined(__APPLE__)
 #        define MANGLE(a) "_" #a
 #    else
 #        define MANGLE(a) #a