[Scummvm-git-logs] scummvm master -> 6ef406ac20a68f53e66bb98a0c9842dc9553da07

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6ef406ac20 AUDIO: Fix compilation with Fluidsynth2


Commit: 6ef406ac20a68f53e66bb98a0c9842dc9553da07
    https://github.com/scummvm/scummvm/commit/6ef406ac20a68f53e66bb98a0c9842dc9553da07
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-03-09T11:32:57Z

Commit Message:
AUDIO: Fix compilation with Fluidsynth2

Changed paths:
    audio/softsynth/fluidsynth.cpp


diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
index 215547c6ba..3b9f553464 100644
--- a/audio/softsynth/fluidsynth.cpp
+++ b/audio/softsynth/fluidsynth.cpp
@@ -46,7 +46,12 @@
 #include "backends/platform/ios7/ios7_common.h"
 #endif
 
-static void logHandler(int level, char *message, void *data) {
+#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
+static void logHandler(int level, const char *message, void *data)
+#else
+static void logHandler(int level, char *message, void *data)
+#endif
+{
 	switch (level) {
 	case FLUID_PANIC:
 		error("FluidSynth: %s", message);