[OMPT-svn-commit] OpenMPT r22704 - trunk/OpenMPT/libopenmpt/xmp-openmpt

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

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

Log:
[Fix] xmp-openmpt: Work-around incompatible XMPIN_GetInterface declaration with GCC in XMPlay SDK 2025-01-02.

Modified:
   trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp

Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp
==============================================================================
--- trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp	Thu Jan  2 22:13:30 2025	(r22703)
+++ trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp	Thu Jan  2 22:30:13 2025	(r22704)
@@ -42,7 +42,14 @@
 static const char * xmp_openmpt_string = "OpenMPT (" OPENMPT_API_VERSION_STRING ")";
 #endif
 
+// 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 {