Merge tag 'v0.20.22'

release v0.20.22
2018-10-23 20:10:57 +02:00
parent 66ab2de578 9274bc15bc
commit c2a2573aa5
5 changed files with 33 additions and 13 deletions
--- a/src/decoder/plugins/FluidsynthDecoderPlugin.cxx
+++ b/src/decoder/plugins/FluidsynthDecoderPlugin.cxx
@@ -64,7 +64,12 @@ fluidsynth_level_to_mpd(enum fluid_log_level level)
 * logging library.
 */
 static void
-fluidsynth_mpd_log_function(int level, char *message, gcc_unused void *data)
+fluidsynth_mpd_log_function(int level,
+#if FLUIDSYNTH_VERSION_MAJOR >= 2
+			    const
+#endif
+			    char *message,
+			    void *)
 {
 	Log(fluidsynth_domain,
 	    fluidsynth_level_to_mpd(fluid_log_level(level)),