Mercurial > mplayer.hg

changeset 18910:5f31565951f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MinGW 3.1 has added gettimeofday. based on a patch by Gianluigi Tiesi mplayer++at++netfarm++dot++it
author diego
date Wed, 05 Jul 2006 22:47:47 +0000
parents 7f23ec00eb17
children 89af7441989b
files TOOLS/cpuinfo.c libmpdvdkit2/dvd_reader.c libmpdvdkit2/libdvdread_changes.diff
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/TOOLS/cpuinfo.c	Wed Jul 05 22:39:54 2006 +0000
+++ b/TOOLS/cpuinfo.c	Wed Jul 05 22:47:47 2006 +0000
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifdef __MINGW32__
+#if defined(__MINGW32__) && (__MINGW32_MAJOR_VERSION <= 3) && (__MINGW32_MINOR_VERSION < 10)
 #include <sys/timeb.h>
 void gettimeofday(struct timeval* t,void* timezone) {
   struct timeb timebuffer;
--- a/libmpdvdkit2/dvd_reader.c	Wed Jul 05 22:39:54 2006 +0000
+++ b/libmpdvdkit2/dvd_reader.c	Wed Jul 05 22:47:47 2006 +0000
@@ -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;
--- a/libmpdvdkit2/libdvdread_changes.diff	Wed Jul 05 22:39:54 2006 +0000
+++ b/libmpdvdkit2/libdvdread_changes.diff	Wed Jul 05 22:47:47 2006 +0000
@@ -135,7 +135,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;