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.
This commit is contained in:
Sebastian Dröge 2008-01-26 14:35:22 +00:00
parent 23a2e7d7ad
commit 82dc68af48
3 changed files with 10 additions and 2 deletions

View file

@ -1,3 +1,11 @@
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> 2008-01-26 Sebastian Dröge <slomo@circular-chaos.org>
* configure.ac: * configure.ac:

View file

@ -20,8 +20,8 @@
#ifndef __GST_MUSEPACK_DEC_H__ #ifndef __GST_MUSEPACK_DEC_H__
#define __GST_MUSEPACK_DEC_H__ #define __GST_MUSEPACK_DEC_H__
#include <gst/gst.h>
#include <mpcdec/mpcdec.h> #include <mpcdec/mpcdec.h>
#include <gst/gst.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -21,10 +21,10 @@
#include "config.h" #include "config.h"
#endif #endif
#include "gstmusepackreader.h"
#include <gst/gst.h> #include <gst/gst.h>
#include <string.h> #include <string.h>
#include "gstmusepackreader.h"
GST_DEBUG_CATEGORY_EXTERN (musepackdec_debug); GST_DEBUG_CATEGORY_EXTERN (musepackdec_debug);
#define GST_CAT_DEFAULT musepackdec_debug #define GST_CAT_DEFAULT musepackdec_debug