mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

cdparanoiasrc: fix build on OSX by #undef-ing VERSION before including system headers

Browse source 
On OSX the cdparanoia headers include IOKit framework headers (in particular
SCSICmds_INQUIRY_Definitions.h) which define a structure that has a member
named VERSION, so we must #undef VERSION before including those for things
to compile on OSX.

Fixes #609918.
This commit is contained in:
Tim-Philipp Müller 2010-05-30 13:21:00 +01:00 committed by Sebastian Dröge
parent eba4a948fb
commit 74cc986593
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/cdparanoia/gstcdparanoiasrc.c
View file

@ -529,13 +529,12 @@ plugin_init (GstPlugin * plugin)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif
return TRUE;
}
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"cdparanoia",
"Read audio from CD in paranoid mode",
plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
plugin_init, GST_PLUGINS_BASE_VERSION, "LGPL", GST_PACKAGE_NAME,
GST_PACKAGE_ORIGIN)

6
ext/cdparanoia/gstcdparanoiasrc.h
View file

@ -27,6 +27,12 @@ G_BEGIN_DECLS
#define size16 gint16
#define size32 gint32
/* on OSX the cdparanoia headers include IOKit framework headers (in particular
* SCSICmds_INQUIRY_Definitions.h) which define a structure that has a member
* named VERSION, so we must #undef VERSION here for things to compile on OSX */
static char GST_PLUGINS_BASE_VERSION[] = VERSION;
#undef VERSION
#ifdef CDPARANOIA_HEADERS_IN_DIR
#include <cdda/cdda_interface.h>
#include <cdda/cdda_paranoia.h>