* Another FreeBSD compilation fix.

diff --git a/plugins/dvd/dvd_css.c b/plugins/dvd/dvd_css.c
index 47527d176e5c3bac8a8959e95df219881ac82360..bf10695b1671b338fd163b98435761b2cc85590d 100644 (file)
--- a/plugins/dvd/dvd_css.c
+++ b/plugins/dvd/dvd_css.c
@@ -2,7 +2,7 @@
  * dvd_css.c: Functions for DVD authentification and unscrambling
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: dvd_css.c,v 1.32 2001/06/03 12:47:21 sam Exp $
+ * $Id: dvd_css.c,v 1.33 2001/06/07 22:25:42 sam Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -52,16 +52,14 @@
 
 #include "intf_msg.h"
 
-#include "dvd_css.h"
+#include "input_dvd.h"
 
+#include "dvd_css.h"
 #ifdef HAVE_CSS
 #   include "dvd_csstables.h"
 #endif /* HAVE_CSS */
-
 #include "dvd_ioctl.h"
 
-#include "input_dvd.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/dvd/dvd_ifo.c b/plugins/dvd/dvd_ifo.c
index f21a7009b1acd8593578c883ded4e5cf3b88c27d..78885e0d7accce7d9b560e613c75add9bf8ab1b9 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.31 2001/06/07 15:27:44 sam Exp $
+ * $Id: dvd_ifo.c,v 1.32 2001/06/07 22:25:42 sam Exp $
  *
  * Authors: Stéphane Borel <stef@via.ecp.fr>
  *          German Tischler <tanis@gaspode.franken.de>
@@ -52,9 +52,9 @@
 
 #include "intf_msg.h"
 
+#include "input_dvd.h"
 #include "dvd_ifo.h"
 #include "dvd_udf.h"
-#include "input_dvd.h"
 
 #include "modules.h"
 #include "modules_export.h"

diff --git a/plugins/dvd/dvd_summary.c b/plugins/dvd/dvd_summary.c
index 22d5f6ac7f78379945020f3b11f361b641cedf80..6c2ede655f471d3933dc566e1e44f8005e8ca949 100644 (file)
--- a/plugins/dvd/dvd_summary.c
+++ b/plugins/dvd/dvd_summary.c
@@ -3,7 +3,7 @@
  * found in .ifo.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: dvd_summary.c,v 1.3 2001/06/03 12:47:21 sam Exp $
+ * $Id: dvd_summary.c,v 1.4 2001/06/07 22:25:42 sam Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -64,8 +64,8 @@
 
 #include "main.h"
 
-#include "dvd_ifo.h"
 #include "input_dvd.h"
+#include "dvd_ifo.h"
 
 #include "debug.h"
 

diff --git a/plugins/dvd/dvd_udf.c b/plugins/dvd/dvd_udf.c
index 34fc0a14a9275e28326dd585d7aa98c54e176bdc..1e1ec73795ce48d6fcae8c163064e1de08a2a1ad 100644 (file)
--- a/plugins/dvd/dvd_udf.c
+++ b/plugins/dvd/dvd_udf.c
@@ -5,7 +5,7 @@
  * contains the basic udf handling functions
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: dvd_udf.c,v 1.9 2001/06/03 12:47:21 sam Exp $
+ * $Id: dvd_udf.c,v 1.10 2001/06/07 22:25:42 sam Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -62,9 +62,9 @@
 
 #include "intf_msg.h"
 
+#include "input_dvd.h"
 #include "dvd_css.h"
 #include "dvd_ifo.h"
-#include "input_dvd.h"
 
 #include "modules.h"
 #include "modules_export.h"

diff --git a/plugins/dvd/input_dvd.c b/plugins/dvd/input_dvd.c
index ef4c4b4b1ec08fe1e6d13da34a2f2ec358bc0f03..c17188e322317467cd7b1ef57d713faff61bc5e1 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.67 2001/06/03 12:47:21 sam Exp $
+ * $Id: input_dvd.c,v 1.68 2001/06/07 22:25:42 sam Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -85,11 +85,11 @@
 
 #include "input.h"
 
+#include "input_dvd.h"
 #include "dvd_netlist.h"
 #include "dvd_ifo.h"
 #include "dvd_css.h"
 #include "dvd_summary.h"
-#include "input_dvd.h"
 #include "mpeg_system.h"
 
 #include "debug.h"

diff --git a/plugins/dvd/input_dvd.h b/plugins/dvd/input_dvd.h
index 753bd6a2c6c8f12c27ed07eec11fd0e93b16075f..397a56a885c3317ed0ea93b1300a4ed1b6b15f6c 100644 (file)
--- a/plugins/dvd/input_dvd.h
+++ b/plugins/dvd/input_dvd.h
@@ -2,7 +2,7 @@
  * input_dvd.h: thread structure of the DVD plugin
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: input_dvd.h,v 1.22 2001/05/19 00:39:30 stef Exp $
+ * $Id: input_dvd.h,v 1.23 2001/06/07 22:25:42 sam Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -66,3 +66,4 @@ typedef struct thread_dvd_data_s
     struct ifo_s *          p_ifo;
 
 } thread_dvd_data_t;
+