aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Viskovatoff <viskovatoff@gmail.com>2010-12-20 19:21:53 -0800
committerMax Kellermann <max@duempel.org>2010-12-21 07:57:07 +0100
commit41fdcf328c0a08fe9adb4007a60c007167054862 (patch)
treee08761532d7361518e57599602c8e97cf01219b5
parent144ad7992e16f82bf068bf5f4b397729aeb40a61 (diff)
downloadmpd-41fdcf328c0a08fe9adb4007a60c007167054862.tar.gz
mpd-41fdcf328c0a08fe9adb4007a60c007167054862.tar.xz
mpd-41fdcf328c0a08fe9adb4007a60c007167054862.zip
decoder/mad: work around build failure on Solaris
Rename the "version" struct, because it seems to be a reserved name on Solaris: "src/decoder/mad_decoder_plugin.c", line 550: (enum) tag redeclared: version cc: acomp failed for src/decoder/mad_decoder_plugin.c
-rw-r--r--NEWS2
-rw-r--r--src/decoder/mad_decoder_plugin.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 8e2a2baa5..2135870d2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
ver 0.16.1 (2010/??/??)
* audio_check: fix parameter in prototype
+* decoder:
+ - mad: work around build failure on Solaris
* output:
- solaris: add missing parameter to open_cloexec() cal
diff --git a/src/decoder/mad_decoder_plugin.c b/src/decoder/mad_decoder_plugin.c
index a11d1b020..2c2906c5c 100644
--- a/src/decoder/mad_decoder_plugin.c
+++ b/src/decoder/mad_decoder_plugin.c
@@ -547,14 +547,14 @@ enum {
XING_SCALE = 0x00000008L
};
-struct version {
+struct lame_version {
unsigned major;
unsigned minor;
};
struct lame {
char encoder[10]; /* 9 byte encoder name/version ("LAME3.97b") */
- struct version version; /* struct containing just the version */
+ struct lame_version version; /* struct containing just the version */
float peak; /* replaygain peak */
float track_gain; /* replaygain track gain */
float album_gain; /* replaygain album gain */