From 1f7539eebb61b7ba8c45fa620de6074e3240ce67 Mon Sep 17 00:00:00 2001 From: ddennedy Date: Thu, 4 Mar 2004 16:52:11 +0000 Subject: [PATCH] add missing header git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@194 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/xine/attributes.h | 46 +++++++++++++++++++++++++++++++++++++++++ src/modules/xine/xineutils.h | 30 +++++++++++++------------- 2 files changed, 61 insertions(+), 15 deletions(-) create mode 100644 src/modules/xine/attributes.h diff --git a/src/modules/xine/attributes.h b/src/modules/xine/attributes.h new file mode 100644 index 0000000..c468b7b --- /dev/null +++ b/src/modules/xine/attributes.h @@ -0,0 +1,46 @@ +/* + * attributes.h + * Copyright (C) 1999-2000 Aaron Holtzman + * + * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. + * + * mpeg2dec is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * mpeg2dec is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* use gcc attribs to align critical data structures */ + +#ifndef ATTRIBUTE_H_ +#define ATTRIBUTE_H_ + +#ifdef ATTRIBUTE_ALIGNED_MAX +#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align))) +#else +#define ATTR_ALIGN(align) +#endif + +/* disable GNU __attribute__ extension, when not compiling with GNU C */ +#if defined(__GNUC__) || defined (__ICC) +#ifndef ATTRIBUTE_PACKED +#define ATTRIBUTE_PACKED 1 +#endif +#else +#undef ATTRIBUTE_PACKED +#ifndef __attribute__ +#define __attribute__(x) /**/ +#endif /* __attribute __*/ +#endif + +#endif /* ATTRIBUTE_H_ */ + diff --git a/src/modules/xine/xineutils.h b/src/modules/xine/xineutils.h index 0b41bcc..c278f34 100644 --- a/src/modules/xine/xineutils.h +++ b/src/modules/xine/xineutils.h @@ -37,23 +37,23 @@ extern "C" { # include #endif -#ifdef XINE_COMPILE +//#ifdef XINE_COMPILE # include "attributes.h" -# include "compat.h" -# include "xmlparser.h" -# include "xine_buffer.h" -# include "configfile.h" -#else -# include -# include -# include -# include -# include -#endif - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +//# include "compat.h" +//# include "xmlparser.h" +//# include "xine_buffer.h" +//# include "configfile.h" +//#else +//# include +//# include +//# include +//# include +//# include +//#endif + +//#ifdef HAVE_CONFIG_H +//#include "config.h" +//#endif #include #include -- 1.7.4.4