* It now compiles under FreeBSD (though DeCSS stuff probably doesn't

work).

diff --git a/plugins/dvd/dvd_ifo.c b/plugins/dvd/dvd_ifo.c
index 4f6ecd565fa862a4258fa5487809aca7db35610a..6e2d74858ac8eb1e9b5e6144d235592f8294461f 100644 (file)
--- a/plugins/dvd/dvd_ifo.c
+++ b/plugins/dvd/dvd_ifo.c
@@ -2,7 +2,7 @@
  * dvd_ifo.c: Functions for ifo parsing
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: dvd_ifo.c,v 1.14 2001/02/22 08:44:45 stef Exp $
+ * $Id: dvd_ifo.c,v 1.15 2001/03/06 10:21:59 massiot Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -29,7 +29,11 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+#include "config.h"
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>

diff --git a/plugins/dvd/dvd_ioctl.h b/plugins/dvd/dvd_ioctl.h
index dd883994e7f358aa6a73011cc6c49ae57623951a..a7096661ea1ca5f18d2961713cc0cde59f7187b4 100644 (file)
--- a/plugins/dvd/dvd_ioctl.h
+++ b/plugins/dvd/dvd_ioctl.h
@@ -2,7 +2,7 @@
  * dvd_ioctl.h: DVD ioctl replacement function
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: dvd_ioctl.h,v 1.2 2001/02/20 23:30:15 sam Exp $
+ * $Id: dvd_ioctl.h,v 1.3 2001/03/06 10:21:59 massiot Exp $
  *
  * Authors: David Giller <rafetmad@oxy.edu>
  *          Eberhard Moenkeberg <emoenke@gwdg.de>
@@ -46,7 +46,7 @@ int dvd_ioctl( int i_fd, unsigned long i_op, void *p_arg );
 
 #ifdef SYS_BEOS
 #   include <be/support/byteorder.h>
-#else
+#elif defined(SYS_LINUX)
 #   include <asm/byteorder.h>
 #endif
 

diff --git a/plugins/dvd/input_dvd.c b/plugins/dvd/input_dvd.c
index 0ab12deb1a6dcbcd9bf2ef4c315efa202a81601d..f1f949fbb1e16ed5e0f5f13aac8e984bd0a34eaa 100644 (file)
--- a/plugins/dvd/input_dvd.c
+++ b/plugins/dvd/input_dvd.c
@@ -10,7 +10,7 @@
  *  -dvd_udf to find files
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.29 2001/03/05 00:40:06 stef Exp $
+ * $Id: input_dvd.c,v 1.30 2001/03/06 10:21:59 massiot Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -52,7 +52,6 @@
 
 #include <string.h>
 #include <errno.h>
-#include <malloc.h>
 
 #include "config.h"
 #include "common.h"