oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/mad: work around build failure on Solaris

Browse Source 
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
This commit is contained in:
Alex Viskovatoff 2010-12-20 19:21:53 -08:00 committed by Max Kellermann
parent 144ad7992e
commit 41fdcf328c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,5 +1,7 @@
ver 0.16.1 (2010/??/??) ver 0.16.1 (2010/??/??)
* audio_check: fix parameter in prototype * audio_check: fix parameter in prototype
* decoder:
- mad: work around build failure on Solaris
* output: * output:
- solaris: add missing parameter to open_cloexec() cal - solaris: add missing parameter to open_cloexec() cal

4
src/decoder/mad_decoder_plugin.c
View File

@ -547,14 +547,14 @@ enum {
XING_SCALE = 0x00000008L XING_SCALE = 0x00000008L
}; };
struct version { struct lame_version {
unsigned major; unsigned major;
unsigned minor; unsigned minor;
}; };
struct lame { struct lame {
char encoder[10]; /* 9 byte encoder name/version ("LAME3.97b") */ 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 peak; /* replaygain peak */
float track_gain; /* replaygain track gain */ float track_gain; /* replaygain track gain */
float album_gain; /* replaygain album gain */ float album_gain; /* replaygain album gain */