From 8dc253dad613fa9408f0a0ccb674e9e77ddef767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sat, 8 Apr 2006 16:42:23 +0000 Subject: Ancient platforms support: - rint, lrint, M_PI (ffmpeg and goom) - avoid mkdir warnings - check for older _GUID_DEFINED too - ressurected generating inttypes, cleaned public os_types.h - moved function redefiniton used only in the old MSVC to central place Windows port update: - build internal ffmpeg: - workaround 'near' keyword problem - proper using __declspec(dllimport) Other changes: - LIBFFMPEG_CFLAGS --> LIBFFMPEG_CPPFLAGS CVS patchset: 7964 CVS date: 2006/04/08 16:42:23 --- src/xine-engine/Makefile.am | 2 +- src/xine-engine/load_plugins.c | 5 +++-- src/xine-engine/xine.c | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/xine-engine') diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 18f3541b5..8bd404993 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/misc/Makefile.common include $(top_srcdir)/lib/Makefile.common AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) -AM_CPPFLAGS = $(ZLIB_CPPFLAGS) +AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE LIBTOOL = $(SHELL) $(top_builddir)/libtool lib_LTLIBRARIES = libxine.la diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 0bca4bd4e..3a7302ef9 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2005 the xine project + * Copyright (C) 2000-2006 the xine project * * This file is part of xine, a free video player. * @@ -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: load_plugins.c,v 1.220 2006/02/14 18:47:46 dsalt Exp $ + * $Id: load_plugins.c,v 1.221 2006/04/08 16:42:37 valtri Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -39,6 +39,7 @@ #include #include #include +#include #include #include diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 8dac5c264..99c46d1e3 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2005 the xine project + * Copyright (C) 2000-2006 the xine project * * This file is part of xine, a free video player. * @@ -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: xine.c,v 1.322 2006/03/17 18:52:04 hadess Exp $ + * $Id: xine.c,v 1.323 2006/04/08 16:42:37 valtri Exp $ */ /* @@ -36,6 +36,7 @@ #include #include #include +#include #if defined (__linux__) #include #elif defined (__FreeBSD__) -- cgit v1.2.3