Mercurial > mplayer.hg
changeset 24057:eb9f3e3723d1
Remove local MinGW gettimeofday() implementation, there is now a native
one in the same file.
| author | diego |
|---|---|
| date | Thu, 16 Aug 2007 10:47:22 +0000 |
| parents | 5b9dcfa2d0f0 |
| children | 345b18b889c9 |
| files | dvdread/dvd_reader.c dvdread/libdvdread_changes.diff |
| diffstat | 2 files changed, 1 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/dvdread/dvd_reader.c Thu Aug 16 07:00:08 2007 +0000 +++ b/dvdread/dvd_reader.c Thu Aug 16 10:47:22 2007 +0000 @@ -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"
--- a/dvdread/libdvdread_changes.diff Thu Aug 16 07:00:08 2007 +0000 +++ b/dvdread/libdvdread_changes.diff Thu Aug 16 10:47:22 2007 +0000 @@ -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"