From 4092da4dc06990ea4cf578703a81457866724f8e Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 18 Apr 2007 09:56:24 +0000 Subject: Fix preprocessor conditionals: libdvdnav includes libdvdread and configure enables libdvdread support if libdvdnav is found. There is no need to check separately in the source with the preprocessor. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23016 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cfg-common.h') diff --git a/cfg-common.h b/cfg-common.h index 330e2ec761..2a1851dd6d 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -27,7 +27,7 @@ {"vcd", "-vcd N has been removed, use vcd://N instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL}, {"cuefile", "-cuefile has been removed, use cue://filename:N where N is the track number.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, -#if defined(USE_DVDREAD) || defined(USE_DVDNAV) +#ifdef USE_DVDREAD {"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"dvd-speed", &dvd_speed, CONF_TYPE_INT, 0, 0, 0, NULL}, #else @@ -374,7 +374,7 @@ extern int reuse_socket; #endif -#if defined(USE_DVDREAD) || defined(USE_DVDNAV) +#ifdef USE_DVDREAD extern int dvd_speed; /* stream/stream_dvd.c */ #endif -- cgit v1.2.3