diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
| commit | 13221a716588dc88c1151e0a0f8eb7cce41d461c (patch) | |
| tree | 3184184f1e984d248e2570ffa05c79589d2c9a1c /stream/stream_cddb.c | |
| parent | c4f7b9666f753b320157e6497f9114523878885f (diff) | |
| parent | bb54613ac1211c73a3614db6b7326d7cd9be39da (diff) | |
| download | mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.bz2 mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.xz | |
Merge svn changes up to r30663
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
Diffstat (limited to 'stream/stream_cddb.c')
| -rw-r--r-- | stream/stream_cddb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c index 0c1bc0ccc6..2b84fc620f 100644 --- a/stream/stream_cddb.c +++ b/stream/stream_cddb.c @@ -60,7 +60,7 @@ #include <sys/cdio.h> #elif defined(__MINGW32__) || defined(__CYGWIN__) #include <ddk/ntddcdrm.h> -#elif (__bsdi__) +#elif defined(__bsdi__) #include <dvd.h> #elif defined(__APPLE__) || defined(__DARWIN__) #include <IOKit/storage/IOCDTypes.h> |