mirror of
https://github.com/mpv-player/mpv
synced 2024-12-11 17:37:23 +00:00
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
This commit is contained in:
parent
12b340732a
commit
6c32800e44
@ -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"
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user