[MPlayer-cvslog] r24077 - in trunk/dvdread: dvd_reader.c libdvdread_changes.diff

[diego]

Author: diego
Date: Thu Aug 16 12:47:22 2007
New Revision: 24077

Log:
Remove local MinGW gettimeofday() implementation, there is now a native
one in the same file.


Modified:
   trunk/dvdread/dvd_reader.c
   trunk/dvdread/libdvdread_changes.diff

Modified: trunk/dvdread/dvd_reader.c
==============================================================================
--- trunk/dvdread/dvd_reader.c	(original)
+++ trunk/dvdread/dvd_reader.c	Thu Aug 16 12:47:22 2007
@@ -51,16 +51,6 @@
 #include <mntent.h>
 #endif
 
-#if defined(__MINGW32__) && (__MINGW32_MAJOR_VERSION <= 3) && (__MINGW32_MINOR_VERSION < 10)
-#include <sys/timeb.h>
-static void gettimeofday(struct timeval* t,void* timezone){
-    struct timeb timebuffer;
-    ftime( &timebuffer );
-    t->tv_sec=timebuffer.time;
-    t->tv_usec=1000*timebuffer.millitm;
-}
-#endif
-
 #include "dvd_reader.h"
 #include "dvd_input.h"
 #include "dvd_udf.h"

Modified: trunk/dvdread/libdvdread_changes.diff
==============================================================================
--- trunk/dvdread/libdvdread_changes.diff	(original)
+++ trunk/dvdread/libdvdread_changes.diff	Thu Aug 16 12:47:22 2007
@@ -56,7 +56,7 @@
 
 --- dvdread.orig/dvd_reader.c	2007-08-06 13:34:37.000000000 +0200
 +++ dvdread/dvd_reader.c	2007-08-06 13:35:19.000000000 +0200
-@@ -39,12 +37,24 @@
+@@ -39,9 +37,11 @@
  
  #if defined(__sun)
  #include <sys/mnttab.h>
@@ -69,19 +69,6 @@
  #include <mntent.h>
  #endif
  
-+#if defined(__MINGW32__) && (__MINGW32_MAJOR_VERSION <= 3) && (__MINGW32_MINOR_VERSION < 10)
-+#include <sys/timeb.h>
-+static void gettimeofday(struct timeval* t,void* timezone){
-+    struct timeb timebuffer;
-+    ftime( &timebuffer );
-+    t->tv_sec=timebuffer.time;
-+    t->tv_usec=1000*timebuffer.millitm;
-+}
-+#endif
-+
- #include "dvd_reader.h"
- #include "dvd_input.h"
- #include "dvd_udf.h"
 @@ -52,7 +68,7 @@
  
  #include "dvdread_internal.h"