[Mplayer-cvslog] CVS: main/libmpdvdkit bswap.h,1.1,1.2 common.h,1.1,1.2 dvd_reader.c,1.4,1.5 ioctl.h,1.2,1.3 libdvdcss.c,1.5,1.6

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdvdkit
In directory mail:/var/tmp.root/cvs-serv21644/libmpdvdkit

Modified Files:
	bswap.h common.h dvd_reader.c ioctl.h libdvdcss.c 
Log Message:
cygwin & darwin fixes by Joey Parrish <joey at yunamusic.com>


Index: bswap.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit/bswap.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bswap.h	24 Apr 2002 19:28:03 -0000	1.1
+++ bswap.h	4 Jun 2002 20:11:15 -0000	1.2
@@ -54,7 +54,7 @@
  * functionality! 
  */
 
-#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__)
+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(__CYGWIN__)
 #define B2N_16(x) \
  x = ((((x) & 0xff00) >> 8) | \
       (((x) & 0x00ff) << 8))

Index: common.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit/common.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- common.h	24 Apr 2002 19:28:03 -0000	1.1
+++ common.h	4 Jun 2002 20:11:15 -0000	1.2
@@ -138,7 +138,7 @@
  *****************************************************************************/
 #ifdef NTOHL_IN_SYS_PARAM_H
 #   include <sys/param.h>
-#elif defined(WIN32)
+#elif defined(WIN32) && !defined(__CYGWIN__)
 #   include <winsock.h>
 #else
 #   include <netinet/in.h>
@@ -201,7 +201,7 @@
 #   define I64C(x)         x##LL
 #endif
 
-#if defined( WIN32 )
+#if defined( WIN32 ) && !defined(__CYGWIN__)
 #   ifndef _OFF_T_DEFINED
 typedef __int64 off_t;
 #       define _OFF_T_DEFINED

Index: dvd_reader.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit/dvd_reader.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dvd_reader.c	1 May 2002 09:29:05 -0000	1.4
+++ dvd_reader.c	4 Jun 2002 20:11:15 -0000	1.5
@@ -40,8 +40,14 @@
 #include <mntent.h>
 #endif
 
-#if defined(SYS_BSD)
+#if defined(SYS_BSD) || defined(__CYGWIN__)
 typedef off_t off64_t;
+#define lseek64 lseek
+#define stat64 stat
+#endif
+
+#if defined(SYS_DARWIN)
+typedef u_int64_t off64_t
 #define lseek64 lseek
 #define stat64 stat
 #endif

Index: ioctl.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit/ioctl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ioctl.h	29 Apr 2002 21:42:36 -0000	1.2
+++ ioctl.h	4 Jun 2002 20:11:15 -0000	1.3
@@ -32,6 +32,13 @@
 int ioctl_SendChallenge     ( int, int *, u8 * );
 int ioctl_SendKey2          ( int, int *, u8 * );
 
+#if defined (__CYGWIN__)
+#include <w32api/windef.h>
+#include <w32api/winnt.h>
+#define va_list void
+#include <w32api/winbase.h>
+#endif
+
 /*****************************************************************************
  * Common macro, BeOS specific
  *****************************************************************************/

Index: libdvdcss.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit/libdvdcss.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libdvdcss.c	25 Apr 2002 19:06:45 -0000	1.5
+++ libdvdcss.c	4 Jun 2002 20:11:15 -0000	1.6
@@ -34,7 +34,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#if defined( WIN32 )
+#if defined( WIN32 ) && !defined(__CYGWIN__)
 #   include <io.h>                                                 /* read() */
 #else
 #   include <sys/uio.h>                                      /* struct iovec */
@@ -43,7 +43,7 @@
 #include "config.h"
 #include "common.h"
 
-#if defined( WIN32 )
+#if defined( WIN32 ) && !defined(__CYGWIN__)
 #   include "input_iovec.h"
 #endif