[MPlayer-cvslog] r18915 - in trunk: TOOLS/cpuinfo.c libmpdvdkit2/dvd_reader.c libmpdvdkit2/libdvdread_changes.diff

[diego]

Author: diego
Date: Thu Jul  6 00:47:47 2006
New Revision: 18915

Modified:
   trunk/TOOLS/cpuinfo.c
   trunk/libmpdvdkit2/dvd_reader.c
   trunk/libmpdvdkit2/libdvdread_changes.diff

Log:
MinGW 3.1 has added gettimeofday.
based on a patch by Gianluigi Tiesi mplayer++at++netfarm++dot++it


Modified: trunk/TOOLS/cpuinfo.c
==============================================================================
--- trunk/TOOLS/cpuinfo.c	(original)
+++ trunk/TOOLS/cpuinfo.c	Thu Jul  6 00:47:47 2006
@@ -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;

Modified: trunk/libmpdvdkit2/dvd_reader.c
==============================================================================
--- trunk/libmpdvdkit2/dvd_reader.c	(original)
+++ trunk/libmpdvdkit2/dvd_reader.c	Thu Jul  6 00:47:47 2006
@@ -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;

Modified: trunk/libmpdvdkit2/libdvdread_changes.diff
==============================================================================
--- trunk/libmpdvdkit2/libdvdread_changes.diff	(original)
+++ trunk/libmpdvdkit2/libdvdread_changes.diff	Thu Jul  6 00:47:47 2006
@@ -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;