From a6cf8a908c4fc0667dce1bdfaf5bbadc82dc1051 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 11 Dec 2007 23:52:55 +0000 Subject: Replace SYS_DARWIN by __APPLE__ and __DARWIN__ where appropriate. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25370 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_dvd.c | 4 ++-- stream/stream_vcd.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index 2f2a3e6dd7..4ce7aa6ee1 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -768,7 +768,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { */ 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 mode, void* opts, int* file_format) { return STREAM_UNSUPPORTED; } } else -#endif /* SYS_DARWIN */ +#endif /* defined(__APPLE__) || defined(__DARWIN__) */ { dvd = DVDOpen(dvd_device); if(!dvd) { diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c index fe07a6e4ea..1060b0f0e4 100644 --- a/stream/stream_vcd.c +++ b/stream/stream_vcd.c @@ -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" -- cgit v1.2.3