summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2001-07-27 22:00:27 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2001-07-27 22:00:27 +0000
commit83c360412fdc9cb3682badf3044fb7d5af52b67a (patch)
treed95311d315178396da567915c1206d0e896bdb3e
parent2204ac019cd8f926bec54e426853b3993eefb532 (diff)
downloadxine-lib-83c360412fdc9cb3682badf3044fb7d5af52b67a.tar.gz
xine-lib-83c360412fdc9cb3682badf3044fb7d5af52b67a.tar.bz2
One step back. It seems last changes about devfs will never fixed the problems.
Is there a good soul to fixe this (i haven't any devfs here, i've just introduce this to avoid ton of mails..... missed ;-) ). CVS patchset: 360 CVS date: 2001/07/27 22:00:27
-rw-r--r--src/input/input_dvd.c4
-rw-r--r--src/input/input_stdin_fifo.c4
-rw-r--r--src/input/input_vcd.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 082c9867f..8b642d5df 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_dvd.c,v 1.16 2001/07/27 15:50:04 f1rmb Exp $
+ * $Id: input_dvd.c,v 1.17 2001/07/27 22:00:27 f1rmb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -56,7 +56,7 @@ static uint32_t xine_debug;
#define RDVD "/vol/dev/aliases/cdrom0"
#define DVD RDVD
#else
-#if defined(CONFIG_DEVFS_FS) && defined(CONFIG_DEVFS_MOUNT)
+#if defined(CONFIG_DEVFS_FS)
#define DVD "/dev/cdroms/dvd"
#define RDVD "/dev/cdroms/rdvd"
#else
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 3624c42a9..98f0c7c34 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_stdin_fifo.c,v 1.9 2001/07/27 15:50:04 f1rmb Exp $
+ * $Id: input_stdin_fifo.c,v 1.10 2001/07/27 22:00:27 f1rmb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -64,7 +64,7 @@ static int stdin_plugin_open(input_plugin_t *this_gen, char *mrl) {
if(!strncasecmp(mrl, "stdin:", 6)
|| !strncmp(mrl, "-", 1)) {
-#if defined(CONFIG_DEVFS_FS) && defined (CONFIG_DEVFS_MOUNT)
+#if defined(CONFIG_DEVFS_FS)
filename = "/dev/vc/stdin";
#else
filename = "/dev/stdin";
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 59006d67d..27142decc 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_vcd.c,v 1.17 2001/07/27 15:50:04 f1rmb Exp $
+ * $Id: input_vcd.c,v 1.18 2001/07/27 22:00:27 f1rmb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -57,7 +57,7 @@ static uint32_t xine_debug;
#define CDROM "/vol/dev/aliases/cdrom0"
#else
/* for FreeBSD make a link to the right devnode, like /dev/acd0c */
-#if defined(CONFIG_DEVFS_FS) && defined (CONFIG_DEVFS_MOUNT)
+#if defined(CONFIG_DEVFS_FS)
#define CDROM "/dev/cdroms/cdrom"
#else
#define CDROM "/dev/cdrom"