From 82dc68af4807b931ca9a320d99add4e6a943aa31 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 26 Jan 2008 14:35:22 +0000 Subject: [PATCH] ext/musepack/: First include the libmpcdec headers before everything else as they #define TRUE and FALSE unconditiona... Original commit message from CVS: * ext/musepack/gstmusepackdec.h: * ext/musepack/gstmusepackreader.c: First include the libmpcdec headers before everything else as they #define TRUE and FALSE unconditionally and we otherwise get conflicts with the ones that GLib defines. --- ChangeLog | 8 ++++++++ ext/musepack/gstmusepackdec.h | 2 +- ext/musepack/gstmusepackreader.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ceb9f16..f559bea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2008-01-26 Sebastian Dröge + * ext/musepack/gstmusepackdec.h: + * ext/musepack/gstmusepackreader.c: + First include the libmpcdec headers before everything else as they + #define TRUE and FALSE unconditionally and we otherwise get conflicts + with the ones that GLib defines. + +2008-01-26 Sebastian Dröge + * configure.ac: * ext/soundtouch/gstpitch.cc: Add support for libsoundtouch 1.3.1 and add an ugly workaround for diff --git a/ext/musepack/gstmusepackdec.h b/ext/musepack/gstmusepackdec.h index 35baced..858372f 100644 --- a/ext/musepack/gstmusepackdec.h +++ b/ext/musepack/gstmusepackdec.h @@ -20,8 +20,8 @@ #ifndef __GST_MUSEPACK_DEC_H__ #define __GST_MUSEPACK_DEC_H__ -#include #include +#include G_BEGIN_DECLS diff --git a/ext/musepack/gstmusepackreader.c b/ext/musepack/gstmusepackreader.c index d98f48f..10de6b0 100644 --- a/ext/musepack/gstmusepackreader.c +++ b/ext/musepack/gstmusepackreader.c @@ -21,10 +21,10 @@ #include "config.h" #endif +#include "gstmusepackreader.h" #include #include -#include "gstmusepackreader.h" GST_DEBUG_CATEGORY_EXTERN (musepackdec_debug); #define GST_CAT_DEFAULT musepackdec_debug -- 2.7.4