From 6c32800e44fa9fd60bbd43cfa2e6dda144846e94 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 16 Aug 2007 10:47:22 +0000
Subject: [PATCH] Remove local MinGW gettimeofday() implementation, there is
 now a native one in the same file.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24077 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 dvdread/dvd_reader.c            | 10 ----------
 dvdread/libdvdread_changes.diff | 15 +--------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/dvdread/dvd_reader.c b/dvdread/dvd_reader.c
index a96a0903d8..72a7219ac9 100644
--- a/dvdread/dvd_reader.c
+++ b/dvdread/dvd_reader.c
@@ -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"
diff --git a/dvdread/libdvdread_changes.diff b/dvdread/libdvdread_changes.diff
index af8dd2fca7..ae3624b922 100644
--- a/dvdread/libdvdread_changes.diff
+++ b/dvdread/libdvdread_changes.diff
@@ -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"