Merged revision(s) 24996 from branches/OpenMPT-1.30:

Merged revision(s) 24990 from trunk/OpenMPT:
[Fix] LAME: Do not touch WinAPI CDECL macro.
........
........


git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.28@24998 56274372-70c3-4bfc-bfc3-4c3a0b034d27

Author: manxorist

include/lame/OpenMPT.txt

@@ -1,6 +1,7 @@
 lame library version 3.100.
 The following changes have been made:
  *  Obviously, unnecessary folders and files have been removed.
+ *  `include/lame.h` has been modified to not touch WinAPI macro `CDECL`
  *  Forced library name in lame.def has been removed.
  *  All modifications have been marked with /* OpenMPT */.
  *  For building, premake is used to generate Visual Studio project files.

include/lame/include/lame.h

@@ -38,10 +38,15 @@ extern "C" {
 typedef void (*lame_report_function)(const char *format, va_list ap);
 
 #if defined(WIN32) || defined(_WIN32)
+#include <windows.h>  /* OpenMPT */
+#if 0  /* OpenMPT */
 #undef CDECL
 #define CDECL __cdecl
+#endif  /* OpenMPT */
 #else
+#ifndef CDECL  /* OpenMPT */
 #define CDECL
+#endif  /* OpenMPT */
 #endif
 
 #define DEPRECATED_OR_OBSOLETE_CODE_REMOVED 1