Mercurial > libdvdnav.hg
changeset 250:12cdd1369f77 src
patch from Franti¡¯ek to avoid symbol name clashes
| author | mroi |
|---|---|
| date | Sun, 12 Sep 2004 15:18:16 +0000 |
| parents | 5d643668f1e3 |
| children | 1c8dc80922d3 |
| files | dvdnav_internal.h dvdread/dvd_reader.c |
| diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/dvdnav_internal.h Sun Sep 12 15:12:43 2004 +0000 +++ b/dvdnav_internal.h Sun Sep 12 15:18:16 2004 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001 Rich Wareham <richwareham@users.sourceforge.net> + * Copyright (C) 2001-2004 Rich Wareham <richwareham@users.sourceforge.net> * * This file is part of libdvdnav, a DVD navigation library. * @@ -47,7 +47,7 @@ /* replacement gettimeofday implementation */ #include <sys/timeb.h> -static inline int gettimeofday( struct timeval *tv, void *tz ) +static inline int _private_gettimeofday( struct timeval *tv, void *tz ) { struct timeb t; ftime( &t ); @@ -55,6 +55,7 @@ tv->tv_usec = t.millitm * 1000; return 0; } +#define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ)) #include <io.h> /* read() */ #define lseek64 _lseeki64
--- a/dvdread/dvd_reader.c Sun Sep 12 15:12:43 2004 +0000 +++ b/dvdread/dvd_reader.c Sun Sep 12 15:18:16 2004 +0000 @@ -1,7 +1,7 @@ /* - * Copyright (C) 2001, 2002, 2003 Billy Biggs <vektor@dumbterm.net>, - * Håkan Hjort <d95hjort@dtek.chalmers.se>, - * Björn Englund <d4bjorn@dtek.chalmers.se> + * Copyright (C) 2001-2004 Billy Biggs <vektor@dumbterm.net>, + * Håkan Hjort <d95hjort@dtek.chalmers.se>, + * Björn Englund <d4bjorn@dtek.chalmers.se> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ #ifdef WIN32 /* replacement gettimeofday implementation */ #include <sys/timeb.h> -static inline int gettimeofday( struct timeval *tv, void *tz ) +static inline int _private_gettimeofday( struct timeval *tv, void *tz ) { struct timeb t; ftime( &t ); @@ -44,6 +44,7 @@ tv->tv_usec = t.millitm * 1000; return 0; } +#define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ)) #include <io.h> /* read() */ #define lseek64 _lseeki64 #endif