aboutsummaryrefslogtreecommitdiffhomepage
path: root/dvdread
diff options
context:
space:
mode:
authorGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-08-21 17:12:30 +0000
committerGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-08-21 17:12:30 +0000
commit0816147935be33b08d7c2e7558d12244ac18caf0 (patch)
tree828ba682fd378973b471e0bdc7b1cfc60d4aa9ef /dvdread
parentf12a0e61cc484e8175164303c3c6b92ee53ef942 (diff)
Remove Windows-only replacement gettimeofday() implementation, both Cygwin
and MinGW have gettimeofday() in recent versions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24115 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'dvdread')
-rw-r--r--dvdread/dvd_reader.c12
-rw-r--r--dvdread/libdvdread_changes.diff28
2 files changed, 24 insertions, 16 deletions
diff --git a/dvdread/dvd_reader.c b/dvdread/dvd_reader.c
index 0914bc6391..49140544e4 100644
--- a/dvdread/dvd_reader.c
+++ b/dvdread/dvd_reader.c
@@ -189,18 +189,6 @@ void SetAlignHandle(dvd_reader_t *device, void *align)
dev->align = align;
}
-#ifdef WIN32 /* replacement gettimeofday implementation */
-#include <sys/timeb.h>
-static int gettimeofday( struct timeval *tv, void *tz )
-{
- struct timeb t;
- ftime( &t );
- tv->tv_sec = t.time;
- tv->tv_usec = t.millitm * 1000;
- return 0;
-}
-#endif
-
/* Loop over all titles and call dvdcss_title to crack the keys. */
static int initAllCSSKeys( dvd_reader_t *dvd )
diff --git a/dvdread/libdvdread_changes.diff b/dvdread/libdvdread_changes.diff
index c7ee3dc1fa..f0177aa5e5 100644
--- a/dvdread/libdvdread_changes.diff
+++ b/dvdread/libdvdread_changes.diff
@@ -22,7 +22,27 @@
struct dvd_reader_s {
/* Basic information. */
-@@ -494,7 +500,7 @@
+@@ -183,19 +189,7 @@
+ dev->align = align;
+ }
+
+-#ifdef WIN32 /* replacement gettimeofday implementation */
+-#include <sys/timeb.h>
+-static int gettimeofday( struct timeval *tv, void *tz )
+-{
+- struct timeb t;
+- ftime( &t );
+- tv->tv_sec = t.time;
+- tv->tv_usec = t.millitm * 1000;
+- return 0;
+-}
+-#endif
+
+-
+ /* Loop over all titles and call dvdcss_title to crack the keys. */
+ static int initAllCSSKeys( dvd_reader_t *dvd )
+ {
+@@ -494,7 +488,7 @@
char *path_copy;
#if defined(SYS_BSD)
struct fstab* fe;
@@ -31,7 +51,7 @@
FILE *mntfile;
#endif
-@@ -598,7 +604,7 @@
+@@ -598,7 +592,7 @@
}
fclose( mntfile );
}
@@ -40,7 +60,7 @@
mntfile = fopen( MOUNTED, "r" );
if( mntfile ) {
struct mntent *me;
-@@ -623,6 +629,9 @@
+@@ -623,6 +617,9 @@
}
fclose( mntfile );
}
@@ -50,7 +70,7 @@
#endif
if( !dev_name ) {
if(verbose >= 1) {
-@@ -841,8 +850,8 @@
+@@ -841,8 +838,8 @@
}
if( dvd->css_state == 1 /* Need key init */ ) {