# HG changeset patch # User diego # Date 1197417175 0 # Node ID 23f02d6ac901677547d9af8ea70b1d3b53e41c4f # Parent baddb0681b2e0fdc9da55c3c205499a421615ab9 Replace SYS_DARWIN by __APPLE__ and __DARWIN__ where appropriate. diff -r baddb0681b2e -r 23f02d6ac901 stream/stream_dvd.c --- 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) { diff -r baddb0681b2e -r 23f02d6ac901 stream/stream_vcd.c --- 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"