diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-05-20 13:50:55 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-05-20 13:50:55 +0000 |
| commit | 8ce6f74d499f0248946261972cb22552482eb7de (patch) | |
| tree | 22f757e2e990be8d3fa92f9230335116a181215b /src/xine-utils | |
| parent | 1f93c3866ac62e671b02ba83978282924086042e (diff) | |
| download | xine-lib-8ce6f74d499f0248946261972cb22552482eb7de.tar.gz xine-lib-8ce6f74d499f0248946261972cb22552482eb7de.tar.bz2 | |
public header cleanup:
* regulate mutual inclusion based on XINE_COMPILE
* src/xine-engine/spu_decoder.h was unused
-> make it the spu decoder API header and remove src/libspudec/spu_decoder_api.h
* mark some xine_stream_t members as unused for next cleanup
CVS patchset: 4883
CVS date: 2003/05/20 13:50:55
Diffstat (limited to 'src/xine-utils')
| -rw-r--r-- | src/xine-utils/Makefile.am | 3 | ||||
| -rw-r--r-- | src/xine-utils/xine_check.h | 7 | ||||
| -rw-r--r-- | src/xine-utils/xineutils.h | 21 |
3 files changed, 23 insertions, 8 deletions
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 669db2cc9..d20c9d39b 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -31,9 +31,10 @@ libxineutils_la_LIBADD = $(THREAD_LIBS) $(xv_libs) include_HEADERS = attributes.h \ compat.h \ - ppcasm_string.h \ xineutils.h \ xine_check.h \ xmllexer.h \ xmlparser.h \ xine_buffer.h + +noinst_HEADERS = ppcasm_string.h diff --git a/src/xine-utils/xine_check.h b/src/xine-utils/xine_check.h index 64c72eef1..149035037 100644 --- a/src/xine-utils/xine_check.h +++ b/src/xine-utils/xine_check.h @@ -1,7 +1,12 @@ #ifndef XINE_CHECK_H #define XINE_CHECK_H #include <stdio.h> -#include "xine.h" + +#ifdef XINE_COMPILE +# include "xine.h" +#else +# include <xine.h> +#endif #define XINE_HEALTH_CHECK_OK 0 #define XINE_HEALTH_CHECK_FAIL 1 diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 33275b05c..23edb48e6 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -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: xineutils.h,v 1.49 2003/04/22 23:30:58 tchamp Exp $ + * $Id: xineutils.h,v 1.50 2003/05/20 13:54:57 mroi Exp $ * */ #ifndef XINEUTILS_H @@ -33,11 +33,20 @@ extern "C" { #include <stdarg.h> #include <inttypes.h> #include <pthread.h> -#include "attributes.h" -#include "compat.h" -#include "xmlparser.h" -#include "xine_buffer.h" -#include "configfile.h" + +#ifdef XINE_COMPILE +# include "attributes.h" +# include "compat.h" +# include "xmlparser.h" +# include "xine_buffer.h" +# include "configfile.h" +#else +# include <xine/attributes.h> +# include <xine/compat.h> +# include <xine/xmlparser.h> +# include <xine/xine_buffer.h> +# include <xine/configfile.h> +#endif #ifdef HAVE_CONFIG_H #include "config.h" |