Martin Storsjö <[email protected]> writes: > On Wed, 20 Jun 2012, Mans Rullgard wrote: > >> Based on patch by Ronald S. Bultje. >> --- >> configure | 4 ++++ >> libavutil/time.c | 14 ++++++++++++++ >> 2 files changed, 18 insertions(+) >> >> diff --git a/configure b/configure >> index 3e17d6a..0a40bf6 100755 >> --- a/configure >> +++ b/configure >> @@ -1092,7 +1092,9 @@ HAVE_LIST=" >> GetProcessAffinityMask >> GetProcessMemoryInfo >> GetProcessTimes >> + GetSystemTimeAsFileTime >> getrusage >> + gettimeofday >> gnu_as >> ibm_asm >> inet_aton >> @@ -2870,6 +2872,7 @@ check_func getaddrinfo $network_extralibs >> check_func gethrtime >> check_func getrusage >> check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss >> +check_func gettimeofday >> check_func inet_aton $network_extralibs >> check_func isatty >> check_func localtime_r >> @@ -2889,6 +2892,7 @@ check_func_headers io.h setmode >> check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi >> check_func_headers windows.h GetProcessAffinityMask >> check_func_headers windows.h GetProcessTimes >> +check_func_headers windows.h GetSystemTimeAsFileTime >> check_func_headers windows.h MapViewOfFile >> check_func_headers windows.h VirtualAlloc >> >> diff --git a/libavutil/time.c b/libavutil/time.c >> index a0b713e..e10363b 100644 >> --- a/libavutil/time.c >> +++ b/libavutil/time.c >> @@ -18,13 +18,27 @@ >> >> #include <stddef.h> >> #include <stdint.h> >> +#if HAVE_GETTIMEOFDAY >> #include <sys/time.h> >> +#elif HAVE_GETSYSTEMTIMEASFILETIME >> +#include <windows.h> >> +#endif > > These defines aren't defined yet here, since config.h isn't included yet.
Yeah, I noticed after I sent the patch. Already fixed in my tree. Do you want me to send an updated patch? > Other than that, it compiles fine on mingw (with the v2 of the first > patch of the series), both in this form and if moving the > GetSystemTimeAsFileTime block above the other (so that one is used > instead of gettimeofday). Thanks for testing. -- Måns Rullgård [email protected] _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
