[OMPT-svn-commit] OpenMPT r22706 - branches/OpenMPT-1.30/libopenmpt

[<sv...@op...>]

Author: manx
Date: Thu Jan  2 22:33:14 2025
New Revision: 22706
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22706

Log:
Merged revision(s) 22705 from branches/OpenMPT-1.31/libopenmpt/xmp-openmpt:
Merged revision(s) 22704 from trunk/OpenMPT:
[Fix] xmp-openmpt: Work-around incompatible XMPIN_GetInterface declaration with GCC in XMPlay SDK 2025-01-02.
........
........

Modified:
   branches/OpenMPT-1.30/libopenmpt/   (props changed)
   branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp   (contents, props changed)

Modified: branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp
==============================================================================
--- branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp	Thu Jan  2 22:32:15 2025	(r22705)
+++ branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp	Thu Jan  2 22:33:14 2025	(r22706)
@@ -79,7 +79,14 @@
 
 #define USE_XMPLAY_ISTREAM
 
+// XMPLAY expects a WINAPI (which is __stdcall) function using an undecorated symbol name which conflicts with the provided declaration.
+#if defined(__GNUC__)
+#define XMPIN_GetInterface XMPIN_GetInterface_Dummy
+#endif
 #include "xmplay/xmpin.h"
+#if defined(__GNUC__)
+#undef XMPIN_GetInterface
+#endif
 
 // Shortcut block assigned to the OpenMPT plugin by un4seen.
 enum {