diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-01-26 14:35:22 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-01-26 14:35:22 +0000 |
| commit | 82dc68af4807b931ca9a320d99add4e6a943aa31 (patch) | |
| tree | 1c3ebdc02df491469296dfd64405b060a0b224e0 | |
| parent | 23a2e7d7adad5ce71446e83134f0c84aba5393e8 (diff) | |
| download | gst-plugins-bad-82dc68af4807b931ca9a320d99add4e6a943aa31.tar.gz gst-plugins-bad-82dc68af4807b931ca9a320d99add4e6a943aa31.tar.bz2 gst-plugins-bad-82dc68af4807b931ca9a320d99add4e6a943aa31.zip | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/musepack/gstmusepackdec.h | 2 | ||||
| -rw-r--r-- | ext/musepack/gstmusepackreader.c | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,13 @@ 2008-01-26 Sebastian Dröge <slomo@circular-chaos.org> + * 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 <slomo@circular-chaos.org> + * 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 35baced0..858372fd 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 <gst/gst.h> #include <mpcdec/mpcdec.h> +#include <gst/gst.h> G_BEGIN_DECLS diff --git a/ext/musepack/gstmusepackreader.c b/ext/musepack/gstmusepackreader.c index d98f48f6..10de6b0d 100644 --- a/ext/musepack/gstmusepackreader.c +++ b/ext/musepack/gstmusepackreader.c @@ -21,10 +21,10 @@ #include "config.h" #endif +#include "gstmusepackreader.h" #include <gst/gst.h> #include <string.h> -#include "gstmusepackreader.h" GST_DEBUG_CATEGORY_EXTERN (musepackdec_debug); #define GST_CAT_DEFAULT musepackdec_debug |