Author: diego Date: Wed Dec 12 00:52:55 2007 New Revision: 25370 Log: Replace SYS_DARWIN by __APPLE__ and __DARWIN__ where appropriate. Modified: trunk/stream/stream_dvd.c trunk/stream/stream_vcd.c Modified: trunk/stream/stream_dvd.c ============================================================================== --- trunk/stream/stream_dvd.c (original) +++ trunk/stream/stream_dvd.c Wed Dec 12 00:52:55 2007 @@ -768,7 +768,7 @@ static int open_s(stream_t *stream,int m */ 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 @@ static int open_s(stream_t *stream,int m return STREAM_UNSUPPORTED; } } else -#endif /* SYS_DARWIN */ +#endif /* defined(__APPLE__) || defined(__DARWIN__) */ { dvd = DVDOpen(dvd_device); if(!dvd) { Modified: trunk/stream/stream_vcd.c ============================================================================== --- trunk/stream/stream_vcd.c (original) +++ trunk/stream/stream_vcd.c Wed Dec 12 00:52:55 2007 @@ -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"