rawmidi: ump - fix snd_ump_block_info_set_block_id double version #2

Define two different symbols with similar functionality.

Fix for:

  CC       ump.lo
/tmp/ccZKscpB.s: Assembler messages:
/tmp/ccZKscpB.s:18: Error: multiple versions [`snd_ump_block_info_set_block_id@@ALSA_1.2.13'|`snd_ump_block_info_set_block_id@ALSA_1.2.10'] for symbol `__snd_ump_block_info_set_block_id'
make[3]: *** [Makefile:392: ump.lo] Error 1

Fixes: 352cbc5e ("rawmidi: ump - fix snd_ump_block_info_set_block_id double version")
Link: https://github.com/alsa-project/alsa-lib/issues/422
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/rawmidi/ump.c b/src/rawmidi/ump.c
index 6807e877455359bf5e4a4a00708196b01e6a30a7..3ff5fc591f6a1789897f27775f174c1a75b19b73 100644 (file)
--- a/src/rawmidi/ump.c
+++ b/src/rawmidi/ump.c
@@ -883,8 +883,16 @@ void snd_ump_block_info_set_block_id(snd_ump_block_info_t *info,
        info->block_id = id;
 }
 
+#ifndef DOXYGEN
+EXPORT_SYMBOL void INTERNAL(snd_ump_block_info_set_block_id_old)
+                               (snd_ump_block_info_t *info, unsigned int id)
+{
+       return INTERNAL(snd_ump_block_info_set_block_id)(info, id);
+}
+#endif
+
 #ifndef DOC_HIDDEN
-use_symbol_version(__snd_ump_block_info_set_block_id, snd_ump_block_info_set_block_id, ALSA_1.2.10);
+use_symbol_version(__snd_ump_block_info_set_block_id_old, snd_ump_block_info_set_block_id, ALSA_1.2.10);
 use_default_symbol_version(__snd_ump_block_info_set_block_id, snd_ump_block_info_set_block_id, ALSA_1.2.13);
 #endif /* DOC_HIDDEN */