dynamic_mod.h: fix prototypes of MikMod_Init and MikMod_strerror:

- old mikmod headers interchangingly used int and BOOL which led to confusions: MikMod_Init() returns error, not success. - libmikmod >= 3.3.2 constified MikMod_Init() and MikMod_strerror(). - dynamic_mod.c: adjust casts accordingly.
libsdl-org · Oct 16, 2017 · dd1b6ee · dd1b6ee
1 parent 623f0ef
commit dd1b6ee
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/dynamic_mod.c b/dynamic_mod.c
@@ -59,7 +59,7 @@ int Mix_InitMOD()
             return -1;
         }
         mikmod.MikMod_Init =
-            (BOOL (*)(CHAR*))
+            (int (*)(MIKMOD3_CONST CHAR*))
             SDL_LoadFunction(mikmod.handle, "MikMod_Init");
         if ( mikmod.MikMod_Init == NULL ) {
             SDL_UnloadObject(mikmod.handle);
@@ -87,7 +87,7 @@ int Mix_InitMOD()
             return -1;
         }
         mikmod.MikMod_strerror =
-            (char* (*)(int))
+            (MIKMOD3_CONST char* (*)(int))
             SDL_LoadFunction(mikmod.handle, "MikMod_strerror");
         if ( mikmod.MikMod_strerror == NULL ) {
             SDL_UnloadObject(mikmod.handle);

diff --git a/dynamic_mod.h b/dynamic_mod.h
@@ -23,18 +23,25 @@
 
 #include "mikmod.h"
 
+/* libmikmod >= 3.3.2 constified several funcs */
+#if (LIBMIKMOD_VERSION < 0x030302)
+#define MIKMOD3_CONST
+#else
+#define MIKMOD3_CONST const
+#endif
+
 typedef struct {
     int loaded;
     void *handle;
 
     void (*MikMod_Exit)(void);
     CHAR* (*MikMod_InfoDriver)(void);
     CHAR* (*MikMod_InfoLoader)(void);
-    BOOL (*MikMod_Init)(CHAR*);
+    int (*MikMod_Init)(MIKMOD3_CONST CHAR*);
     void (*MikMod_RegisterAllLoaders)(void);
     void (*MikMod_RegisterDriver)(struct MDRIVER*);
     int* MikMod_errno;
-    char* (*MikMod_strerror)(int);
+    MIKMOD3_CONST char* (*MikMod_strerror)(int);
     void (*MikMod_free)(void*);
     BOOL (*Player_Active)(void);
     void (*Player_Free)(MODULE*);