comparison dvdread/libdvdread_changes.diff @ 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 aeb5561cf68b
comparison
equal deleted inserted replaced
24056:5b9dcfa2d0f0 24057:eb9f3e3723d1
54 x = ((((x) & 0xff00) >> 8) | \ 54 x = ((((x) & 0xff00) >> 8) | \
55 (((x) & 0x00ff) << 8)) 55 (((x) & 0x00ff) << 8))
56 56
57 --- dvdread.orig/dvd_reader.c 2007-08-06 13:34:37.000000000 +0200 57 --- dvdread.orig/dvd_reader.c 2007-08-06 13:34:37.000000000 +0200
58 +++ dvdread/dvd_reader.c 2007-08-06 13:35:19.000000000 +0200 58 +++ dvdread/dvd_reader.c 2007-08-06 13:35:19.000000000 +0200
59 @@ -39,12 +37,24 @@ 59 @@ -39,9 +37,11 @@
60 60
61 #if defined(__sun) 61 #if defined(__sun)
62 #include <sys/mnttab.h> 62 #include <sys/mnttab.h>
63 +#elif defined(hpux) 63 +#elif defined(hpux)
64 +#include </usr/conf/h/mnttab.h> 64 +#include </usr/conf/h/mnttab.h>
67 -#elif defined(__linux__) 67 -#elif defined(__linux__)
68 +#elif defined(__linux__) || defined(__CYGWIN__) 68 +#elif defined(__linux__) || defined(__CYGWIN__)
69 #include <mntent.h> 69 #include <mntent.h>
70 #endif 70 #endif
71 71
72 +#if defined(__MINGW32__) && (__MINGW32_MAJOR_VERSION <= 3) && (__MINGW32_MINOR_VERSION < 10)
73 +#include <sys/timeb.h>
74 +static void gettimeofday(struct timeval* t,void* timezone){
75 + struct timeb timebuffer;
76 + ftime( &timebuffer );
77 + t->tv_sec=timebuffer.time;
78 + t->tv_usec=1000*timebuffer.millitm;
79 +}
80 +#endif
81 +
82 #include "dvd_reader.h"
83 #include "dvd_input.h"
84 #include "dvd_udf.h"
85 @@ -52,7 +68,7 @@ 72 @@ -52,7 +68,7 @@
86 73
87 #include "dvdread_internal.h" 74 #include "dvdread_internal.h"
88 75
89 -#define DEFAULT_UDF_CACHE_LEVEL 1 76 -#define DEFAULT_UDF_CACHE_LEVEL 1