summaryrefslogtreecommitdiffstats
path: root/libmpdvdkit2
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-05 22:47:47 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-05 22:47:47 +0000
commitf78a2c49108d2b7a516cb8109de3776c10dc4fc4 (patch)
tree0eac5fca6feb1234884cf779652cc3c38d5e71ee /libmpdvdkit2
parente8357eac0f35475135abd70a0b2816101f2291ff (diff)
downloadmpv-f78a2c49108d2b7a516cb8109de3776c10dc4fc4.tar.bz2
mpv-f78a2c49108d2b7a516cb8109de3776c10dc4fc4.tar.xz
MinGW 3.1 has added gettimeofday.
based on a patch by Gianluigi Tiesi mplayer++at++netfarm++dot++it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18915 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdvdkit2')
-rw-r--r--libmpdvdkit2/dvd_reader.c2
-rw-r--r--libmpdvdkit2/libdvdread_changes.diff2
2 files changed, 2 insertions, 2 deletions
diff --git a/libmpdvdkit2/dvd_reader.c b/libmpdvdkit2/dvd_reader.c
index 1b85135937..996477ef2c 100644
--- a/libmpdvdkit2/dvd_reader.c
+++ b/libmpdvdkit2/dvd_reader.c
@@ -50,7 +50,7 @@
#include <mntent.h>
#endif
-#ifdef __MINGW32__
+#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;
diff --git a/libmpdvdkit2/libdvdread_changes.diff b/libmpdvdkit2/libdvdread_changes.diff
index fd468492b9..0774cc8f49 100644
--- a/libmpdvdkit2/libdvdread_changes.diff
+++ b/libmpdvdkit2/libdvdread_changes.diff
@@ -135,7 +135,7 @@ diff -Naur dvdread.orig/dvd_reader.c dvdread/dvd_reader.c
#include <mntent.h>
#endif
-+#ifdef __MINGW32__
++#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;