[OMPT-svn-commit] OpenMPT r21399 - in branches/OpenMPT-1.31: . soundlib src/mpt/base

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

Author: manx
Date: Mon Aug 12 18:09:57 2024
New Revision: 21399
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21399

Log:
Merged revision(s) 21398 from trunk/OpenMPT:
[Ref] mpt/base/detect_compiler.hpp: Add MPT_COMPILER_QUIRK_APPLE_CLANG.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/SampleFormatMP3.cpp
   branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp

Modified: branches/OpenMPT-1.31/soundlib/SampleFormatMP3.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/SampleFormatMP3.cpp	Mon Aug 12 18:09:28 2024	(r21398)
+++ branches/OpenMPT-1.31/soundlib/SampleFormatMP3.cpp	Mon Aug 12 18:09:57 2024	(r21399)
@@ -172,7 +172,7 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wframe-larger-than=16000"
 #endif // MPT_COMPILER_GCC
-#if (MPT_CLANG_AT_LEAST(13,0,0) && !MPT_OS_MACOSX_OR_IOS) || MPT_CLANG_AT_LEAST(13,1,0)
+#if (MPT_CLANG_AT_LEAST(13,0,0) && !defined(MPT_COMPILER_QUIRK_APPLE_CLANG)) || MPT_CLANG_AT_LEAST(13,1,0)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wframe-larger-than"
 #endif // MPT_COMPILER_CLANG
@@ -180,7 +180,7 @@
 {
 	return mp3dec_decode_frame(dec, mp3, mp3_bytes, pcm, info);
 }
-#if (MPT_CLANG_AT_LEAST(13,0,0) && !MPT_OS_MACOSX_OR_IOS) || MPT_CLANG_AT_LEAST(13,1,0)
+#if (MPT_CLANG_AT_LEAST(13,0,0) && !defined(MPT_COMPILER_QUIRK_APPLE_CLANG)) || MPT_CLANG_AT_LEAST(13,1,0)
 #pragma clang diagnostic pop
 #endif // MPT_COMPILER_CLANG
 #if MPT_COMPILER_GCC

Modified: branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp
==============================================================================
--- branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp	Mon Aug 12 18:09:28 2024	(r21398)
+++ branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp	Mon Aug 12 18:09:57 2024	(r21399)
@@ -204,6 +204,16 @@
 
 
 
+// detect compiler quirks
+
+#if MPT_COMPILER_CLANG
+#if defined(__APPLE__)
+#define MPT_COMPILER_QUIRK_APPLE_CLANG
+#endif
+#endif
+
+
+
 // detect compiler setting quirks
 
 #if MPT_COMPILER_GCC