[MPlayer-cvslog] r25425 - in trunk: libvo/vo_gl2.c libvo/vo_sdl.c mplayer.c

[diego]

Author: diego
Date: Mon Dec 17 00:50:05 2007
New Revision: 25425

Log:
Replace some more broken SYS_DARWIN preprocessor conditionals with __APPLE__.


Modified:
   trunk/libvo/vo_gl2.c
   trunk/libvo/vo_sdl.c
   trunk/mplayer.c

Modified: trunk/libvo/vo_gl2.c
==============================================================================
--- trunk/libvo/vo_gl2.c	(original)
+++ trunk/libvo/vo_gl2.c	Mon Dec 17 00:50:05 2007
@@ -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:

Modified: trunk/libvo/vo_sdl.c
==============================================================================
--- trunk/libvo/vo_sdl.c	(original)
+++ trunk/libvo/vo_sdl.c	Mon Dec 17 00:50:05 2007
@@ -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 ();

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Mon Dec 17 00:50:05 2007
@@ -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