Mercurial > libdvdnav.hg

diff dvdnav_internal.h @ 370:d80a041928be src

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gettimeofday() doesn't exist on windows, but recent mingw32 runtime include a replacement. The dvdnav replacement clashes with mingw32's one. This patch will check for it in configure.ac and define the private function only if gettimeofday() is not defined. Patch by Rafael Carr (funman videolan org)
author nicodvb
date Thu, 05 Jun 2008 08:45:35 +0000
parents ce4230602517
children 90ca650854e0
line wrap: on
line diff
--- a/dvdnav_internal.h	Sun Jun 01 16:00:17 2008 +0000
+++ b/dvdnav_internal.h	Thu Jun 05 08:45:35 2008 +0000
@@ -39,6 +39,7 @@
 #define pthread_mutex_unlock(a)  LeaveCriticalSection(a)
 #define pthread_mutex_destroy(a)
 
+#ifndef HAVE_GETTIMEOFDAY
 /* replacement gettimeofday implementation */
 #include <sys/timeb.h>
 static inline int _private_gettimeofday( struct timeval *tv, void *tz )
@@ -50,6 +51,8 @@
   return 0;
 }
 #define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ))
+#endif
+
 #include <io.h> /* read() */
 #define lseek64 _lseeki64