Mercurial > mplayer.hg

changeset 25342:23f02d6ac901

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace SYS_DARWIN by __APPLE__ and __DARWIN__ where appropriate.
author diego
date Tue, 11 Dec 2007 23:52:55 +0000
parents baddb0681b2e
children c852fa4bd3a1
files stream/stream_dvd.c stream/stream_vcd.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/stream/stream_dvd.c	Tue Dec 11 23:25:36 2007 +0000
+++ b/stream/stream_dvd.c	Tue Dec 11 23:52:55 2007 +0000
@@ -768,7 +768,7 @@
      */
     if(!dvd_device) dvd_device=strdup(DEFAULT_DVD_DEVICE);
     dvd_set_speed(dvd_device, dvd_speed);
-#ifdef SYS_DARWIN
+#if defined(__APPLE__) || defined(__DARWIN__)
     /* Dynamic DVD drive selection on Darwin */
     if(!strcmp(dvd_device, "/dev/rdiskN")) {
       int i;
@@ -800,7 +800,7 @@
         return STREAM_UNSUPPORTED;
       }
     } else
-#endif /* SYS_DARWIN */
+#endif /* defined(__APPLE__) || defined(__DARWIN__) */
     {
         dvd = DVDOpen(dvd_device);
         if(!dvd) {
--- a/stream/stream_vcd.c	Tue Dec 11 23:25:36 2007 +0000
+++ b/stream/stream_vcd.c	Tue Dec 11 23:52:55 2007 +0000
@@ -21,7 +21,7 @@
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #include "vcd_read_fbsd.h" 
-#elif defined(SYS_DARWIN)
+#elif defined(__APPLE__)
 #include "vcd_read_darwin.h" 
 #elif defined(WIN32)
 #include "vcd_read_win32.h"