[MPlayer-cvslog] CVS: main/libmpdvdkit2 libdvdread_changes.diff, 1.7, 1.8

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libmpdvdkit2
In directory mail:/var2/tmp/cvs-serv12414

Modified Files:
	libdvdread_changes.diff 
Log Message:
Update with current changes.


Index: libdvdread_changes.diff
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit2/libdvdread_changes.diff,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libdvdread_changes.diff	24 Oct 2005 09:29:15 -0000	1.7
+++ libdvdread_changes.diff	4 Jan 2006 15:25:51 -0000	1.8
@@ -111,7 +111,7 @@
  #include <dirent.h>
   
 -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DARWIN__) || defined(__DragonFly__)
  #define SYS_BSD 1
  #endif
  
@@ -321,6 +321,19 @@
      }
 
 diff -Naur dvdread.orig/ifo_print.h dvdread/ifo_print.h
+--- dvdread/ifo_print.h 2002-08-15 22:13:21.000000000 +0200
++++ /home/diego/src/mplayer/vanilla/libmpdvdkit2/ifo_print.h    2005-12-29 13:13:21.000000000 +0100
+@@ -20,8 +24,8 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+-#include <dvdread/ifo_types.h>
+-#include <dvdread/dvd_reader.h>
++#include "ifo_types.h"
++#include "dvd_reader.h"
+ 
+ #ifdef __cplusplus
+ extern "C" {
 diff -Naur dvdread.orig/ifo_read.c dvdread/ifo_read.c
 --- dvdread.orig/ifo_read.c	30 Jun 2005 22:48:26 -0000	1.4
 +++ dvdread/ifo_read.c	3 Oct 2005 14:29:01 -0000	1.5