# HG changeset patch
# User diego
# Date 1197849005 0
# Node ID 084619331d92611834fc73dd44ae8473aa80d921
# Parent  163348bb1e4afabfd738f47a55836b18fb22f256
Replace some more broken SYS_DARWIN preprocessor conditionals with __APPLE__.

diff -r 163348bb1e4a -r 084619331d92 libvo/vo_gl2.c
--- a/libvo/vo_gl2.c	Sun Dec 16 16:39:10 2007 +0000
+++ b/libvo/vo_gl2.c	Sun Dec 16 23:50:05 2007 +0000
@@ -22,7 +22,7 @@
 #endif
 
 #undef TEXTUREFORMAT_ALWAYS
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
 #define TEXTUREFORMAT_ALWAYS GL_RGBA8
 #endif
 
@@ -808,7 +808,7 @@
         return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD |
                VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
       break;
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
     case IMGFMT_RGB32:
 #else
     case IMGFMT_RGB24:
diff -r 163348bb1e4a -r 084619331d92 libvo/vo_sdl.c
--- a/libvo/vo_sdl.c	Sun Dec 16 16:39:10 2007 +0000
+++ b/libvo/vo_sdl.c	Sun Dec 16 23:50:05 2007 +0000
@@ -731,7 +731,7 @@
 	 * re-assign it.  The comment in sdl_close() seems to imply that we 
 	 * should not free() anything.
 	 */
-	#ifdef SYS_DARWIN
+	#ifdef __APPLE__
 	{
 	const SDL_VideoInfo *vidInfo = NULL;
 	vidInfo = SDL_GetVideoInfo ();
diff -r 163348bb1e4a -r 084619331d92 mplayer.c
--- a/mplayer.c	Sun Dec 16 16:39:10 2007 +0000
+++ b/mplayer.c	Sun Dec 16 23:50:05 2007 +0000
@@ -1055,7 +1055,7 @@
  * make it all work is to use the builtin SDL-bootstrap code, which 
  * will be done automatically by replacing our main() if we include SDL.h.
  */
-#if defined(SYS_DARWIN) && defined(HAVE_SDL)
+#if defined(__APPLE__) && defined(HAVE_SDL)
 #include <SDL.h>
 #endif