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

decoder/mad: work around build failure on Solaris
41fdcf32 · Alex Viskovatoff · Max Kellermann · 144ad799 · 41fdcf32 · 41fdcf32
Commit 41fdcf32 authored Dec 20, 2010 by Alex Viskovatoff Committed by Max Kellermann Dec 21, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

NEWS NEWS +2 -0

mad_decoder_plugin.c src/decoder/mad_decoder_plugin.c +2 -2

No files found.
--- a/NEWS
+++ b/NEWS
 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


--- 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 */