change includes from system include to local include where the file is in

our tree now to avoid version clashes

CVS patchset: 2421
CVS date: 2002/08/09 22:52:14

10 files changed, 36 insertions, 28 deletions

diff --git a/src/input/libdvdnav/decoder.c b/src/input/libdvdnav/decoder.c
index e5e64d0d7..7d01a62f2 100644
--- a/src/input/libdvdnav/decoder.c
+++ b/src/input/libdvdnav/decoder.c
@@ -18,7 +18,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: decoder.c,v 1.2 2002/08/08 21:55:54 richwareham Exp $
+ * $Id: decoder.c,v 1.3 2002/08/09 22:52:14 mroi Exp $
  *
  */
 
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <string.h>  /* For memset */
-#include <ifo_types.h> /* vm_cmd_t */
+#include "ifo_types.h" /* vm_cmd_t */
 #include <assert.h>
 #include "vmcmd.h"
 #include "decoder.h"
diff --git a/src/input/libdvdnav/decoder.h b/src/input/libdvdnav/decoder.h
index 17e2a9199..9b2c45a47 100644
--- a/src/input/libdvdnav/decoder.h
+++ b/src/input/libdvdnav/decoder.h
@@ -18,7 +18,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: decoder.h,v 1.2 2002/08/08 21:55:54 richwareham Exp $
+ * $Id: decoder.h,v 1.3 2002/08/09 22:52:14 mroi Exp $
  *
  */
 
@@ -28,7 +28,7 @@
 #include <inttypes.h>
 #include <sys/time.h>
 
-#include <ifo_types.h> /*  vm_cmd_t */
+#include "ifo_types.h" /*  vm_cmd_t */
 
 /* Uncomment for tracing */
 /* #define TRACE  */
diff --git a/src/input/libdvdnav/dvdnav.c b/src/input/libdvdnav/dvdnav.c
index 17240e173..67013286f 100644
--- a/src/input/libdvdnav/dvdnav.c
+++ b/src/input/libdvdnav/dvdnav.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: dvdnav.c,v 1.2 2002/08/08 21:55:54 richwareham Exp $
+ * $Id: dvdnav.c,v 1.3 2002/08/09 22:52:14 mroi Exp $
  *
  */
 
@@ -30,11 +30,11 @@
 */
 
 #include <pthread.h>
-#include <dvdnav.h>
+#include "dvdnav.h"
 #include "dvdnav_internal.h"
 #include "read_cache.h"
 
-#include <nav_read.h>
+#include "nav_read.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -995,6 +995,10 @@ uint32_t dvdnav_get_next_still_flag(dvdnav_t *this) {
 
 /*
  * $Log: dvdnav.c,v $
+ * Revision 1.3  2002/08/09 22:52:14  mroi
+ * change includes from system include to local include where the file is in
+ * our tree now to avoid version clashes
+ *
  * Revision 1.2  2002/08/08 21:55:54  richwareham
  * Changed loads of #include <dvdread/...> to #include <...>
  *
diff --git a/src/input/libdvdnav/dvdnav.h b/src/input/libdvdnav/dvdnav.h
index 3f84614ea..0160cc05e 100644
--- a/src/input/libdvdnav/dvdnav.h
+++ b/src/input/libdvdnav/dvdnav.h
@@ -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: dvdnav.h,v 1.2 2002/08/08 21:55:54 richwareham Exp $
+ * $Id: dvdnav.h,v 1.3 2002/08/09 22:52:14 mroi Exp $
  *
  */
 
@@ -40,7 +40,7 @@ extern "C" {
 /* Various useful types */
 #include "dvd_types.h"
 
-#include <dvd_reader.h>
+#include "dvd_reader.h"
 
 /**
  * Opaque data-type can be viewed as a 'DVD handle'. You should get
diff --git a/src/input/libdvdnav/dvdnav_events.h b/src/input/libdvdnav/dvdnav_events.h
index 9349b4367..79ff68979 100644
--- a/src/input/libdvdnav/dvdnav_events.h
+++ b/src/input/libdvdnav/dvdnav_events.h
@@ -17,16 +17,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: dvdnav_events.h,v 1.2 2002/08/08 21:55:54 richwareham Exp $
+ * $Id: dvdnav_events.h,v 1.3 2002/08/09 22:52:14 mroi Exp $
  *
  */
 
 #ifndef DVDNAV_EVENTS_H_INCLUDED
 #define DVDNAV_EVENTS_H_INCLUDED
 
-#include <ifo_types.h>
-#include <nav_types.h>
-#include <dvd_reader.h>
+#include "ifo_types.h"
+#include "nav_types.h"
+#include "dvd_reader.h"
 
 /**
  * \file dvdnav_events.h
diff --git a/src/input/libdvdnav/dvdnav_internal.h b/src/input/libdvdnav/dvdnav_internal.h
index 58177b50f..7ec745b42 100644
--- a/src/input/libdvdnav/dvdnav_internal.h
+++ b/src/input/libdvdnav/dvdnav_internal.h
@@ -18,7 +18,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: dvdnav_internal.h,v 1.2 2002/08/08 21:55:54 richwareham Exp $
+ * $Id: dvdnav_internal.h,v 1.3 2002/08/09 22:52:14 mroi Exp $
  *
  */
 
@@ -41,9 +41,9 @@
 
 #undef WORDS_BIGENDIAN
 
-#include <dvd_reader.h>
-#include <ifo_read.h>
-#include <ifo_types.h>
+#include "dvd_reader.h"
+#include "ifo_read.h"
+#include "ifo_types.h"
 
 
 /* Maximum length of an error string */
diff --git a/src/input/libdvdnav/highlight.c b/src/input/libdvdnav/highlight.c
index 3803bccb9..ee5eb163c 100644
--- a/src/input/libdvdnav/highlight.c
+++ b/src/input/libdvdnav/highlight.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: highlight.c,v 1.2 2002/08/08 21:55:54 richwareham Exp $
+ * $Id: highlight.c,v 1.3 2002/08/09 22:52:14 mroi Exp $
  *
  */
 
@@ -35,10 +35,10 @@
 
 #include "vm.h"
 #
-#include <nav_types.h>
+#include "nav_types.h"
 
 #ifdef BUTTON_TESTING
-#include <nav_print.h>
+#include "nav_print.h"
 #endif
 
 /* Highlighting API calls */
diff --git a/src/input/libdvdnav/searching.c b/src/input/libdvdnav/searching.c
index 7b34119d3..d4a4b4280 100644
--- a/src/input/libdvdnav/searching.c
+++ b/src/input/libdvdnav/searching.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: searching.c,v 1.2 2002/08/08 21:55:54 richwareham Exp $
+ * $Id: searching.c,v 1.3 2002/08/09 22:52:14 mroi Exp $
  *
  */
 
@@ -25,11 +25,11 @@
 #include "config.h"
 #endif
 
-#include <dvdnav.h>
+#include "dvdnav.h"
 #include "dvdnav_internal.h"
 
 #include "vm.h"
-#include <nav_types.h>
+#include "nav_types.h"
 
 /* Searching API calls */
 
diff --git a/src/input/libdvdnav/vm.c b/src/input/libdvdnav/vm.c
index 7d56fd6b5..1001ac395 100644
--- a/src/input/libdvdnav/vm.c
+++ b/src/input/libdvdnav/vm.c
@@ -19,7 +19,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: vm.c,v 1.2 2002/08/08 21:55:54 richwareham Exp $
+ * $Id: vm.c,v 1.3 2002/08/09 22:52:14 mroi Exp $
  *
  */
 
@@ -34,8 +34,8 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include <ifo_types.h>
-#include <ifo_read.h>
+#include "ifo_types.h"
+#include "ifo_read.h"
 
 #include "decoder.h"
 #include "vmcmd.h"
@@ -1798,6 +1798,10 @@ static pgcit_t* get_PGCIT(vm_t *vm) {
 
 /*
  * $Log: vm.c,v $
+ * Revision 1.3  2002/08/09 22:52:14  mroi
+ * change includes from system include to local include where the file is in
+ * our tree now to avoid version clashes
+ *
  * Revision 1.2  2002/08/08 21:55:54  richwareham
  * Changed loads of #include <dvdread/...> to #include <...>
  *
diff --git a/src/input/libdvdnav/vmcmd.h b/src/input/libdvdnav/vmcmd.h
index 23f267a69..662cf0b46 100644
--- a/src/input/libdvdnav/vmcmd.h
+++ b/src/input/libdvdnav/vmcmd.h
@@ -18,7 +18,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: vmcmd.h,v 1.2 2002/08/08 21:55:54 richwareham Exp $
+ * $Id: vmcmd.h,v 1.3 2002/08/09 22:52:14 mroi Exp $
  *
  */
 
@@ -26,7 +26,7 @@
 #define VMCMD_H_INCLUDED
 
 #include <inttypes.h>
-#include <ifo_types.h> /*  Only for vm_cmd_t  */
+#include "ifo_types.h" /*  Only for vm_cmd_t  */
 #include "decoder.h"
 
 void vmPrint_mnemonic(vm_cmd_t *command);