From 7204b84beb0f5cfb166e8d56402371d05bece83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 20 Sep 2004 19:30:02 +0000 Subject: Build system improvements: - use replacement functions (macro AC_REPLACE_FUNCS and variable LTLIBOBJS), each function is in a file placed into lib/ directory, it was not necessary, but it looks nice, IMHO - headers cleanups (this was needed): - prototypes of replacement funtions and macros are placed into separate os_internal.h (and included by config.h) - drop include inttypes.h from public xine.h, replaced by custom os_type.h, idea origins from Ogg/Vorbis public headers - disable generating inttypes.h: generated replacement isn't enough for xine-lib but nobody complained (and for M$VC we have special version) - better including headers for win32, let dvdnav use its mutex wrapper - updated M$VC port Result: - xine is compiled nicely by MinGW, CygWin and paritaly M$VC - frontends in M$VC port don't require additional helping headers - moved some platform specific things from xine-utils and win32/contrib to lib/ Finally I can start with real coding. :-) CVS patchset: 6982 CVS date: 2004/09/20 19:30:02 --- src/input/libdvdnav/Makefile.am | 2 +- src/input/libdvdnav/dvd_reader.c | 9 +++++---- src/input/libdvdnav/dvdnav_internal.h | 7 ++++--- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'src/input/libdvdnav') diff --git a/src/input/libdvdnav/Makefile.am b/src/input/libdvdnav/Makefile.am index f48c7a3f9..07b29091f 100644 --- a/src/input/libdvdnav/Makefile.am +++ b/src/input/libdvdnav/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -DDVDNAV_COMPILE +AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -DDVDNAV_COMPILE -DHAVE_DLFCN_H noinst_LTLIBRARIES = libdvdnav.la diff --git a/src/input/libdvdnav/dvd_reader.c b/src/input/libdvdnav/dvd_reader.c index 185143604..964d97f76 100644 --- a/src/input/libdvdnav/dvd_reader.c +++ b/src/input/libdvdnav/dvd_reader.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2001, 2002, 2003 Billy Biggs , - * Håkan Hjort , - * Björn Englund + * Copyright (C) 2001-2004 Billy Biggs , + * Håkan Hjort , + * Björn Englund * * 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 -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 @@ static inline int gettimeofday( struct timeval *tv, void *tz ) tv->tv_usec = t.millitm * 1000; return 0; } +#define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ)) #include /* read() */ #define lseek64 _lseeki64 #endif diff --git a/src/input/libdvdnav/dvdnav_internal.h b/src/input/libdvdnav/dvdnav_internal.h index 29733ed54..35d9f3470 100644 --- a/src/input/libdvdnav/dvdnav_internal.h +++ b/src/input/libdvdnav/dvdnav_internal.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001 Rich Wareham + * Copyright (C) 2001-2004 Rich Wareham * * This file is part of libdvdnav, a DVD navigation library. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dvdnav_internal.h,v 1.14 2004/03/16 11:43:38 mroi Exp $ + * $Id: dvdnav_internal.h,v 1.15 2004/09/20 19:30:04 valtri Exp $ * */ @@ -47,7 +47,7 @@ typedef CRITICAL_SECTION pthread_mutex_t; /* replacement gettimeofday implementation */ #include -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 @@ static inline int gettimeofday( struct timeval *tv, void *tz ) tv->tv_usec = t.millitm * 1000; return 0; } +#define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ)) #include /* read() */ #define lseek64 _lseeki64 -- cgit v1.2.3