From 8a00a66de3e29227444c0e863518743ba2d55f08 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 16 Dec 2007 23:50:05 +0000
Subject: [PATCH] Replace some more broken SYS_DARWIN preprocessor conditionals
 with __APPLE__.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25425 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/vo_gl2.c | 4 ++--
 libvo/vo_sdl.c | 2 +-
 mplayer.c      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index 78a0235b35..092e7660af 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -22,7 +22,7 @@
 #endif
 
 #undef TEXTUREFORMAT_ALWAYS
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
 #define TEXTUREFORMAT_ALWAYS GL_RGBA8
 #endif
 
@@ -808,7 +808,7 @@ query_format(uint32_t format)
         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 --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c
index 311fbb03d1..e812ed22f7 100644
--- a/libvo/vo_sdl.c
+++ b/libvo/vo_sdl.c
@@ -731,7 +731,7 @@ static void set_fullmode (int mode) {
 	 * 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 --git a/mplayer.c b/mplayer.c
index 95c7f51132..9ee4c18b65 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1055,7 +1055,7 @@ void init_vo_spudec(void) {
  * 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