[OMPT-svn-commit] OpenMPT r23432 - in branches/OpenMPT-1.28: . include/mpg123/src/compat

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

Author: manx
Date: Sat Jun  7 22:00:50 2025
New Revision: 23432
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23432

Log:
Merged revision(s) 23427 from trunk/OpenMPT:
[Fix] mpg123: Exclude unneeded and broken strtok work-arounds.
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h

Modified: branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h
==============================================================================
--- branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h	Sat Jun  7 22:00:31 2025	(r23431)
+++ branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h	Sat Jun  7 22:00:50 2025	(r23432)
@@ -116,14 +116,16 @@
 #ifdef HAVE_STRTOK_R
 #define INT123_compat_strtok(a, b, c) strtok_r((a), (b), (c))
 #endif
+#endif  /* OpenMPT */
 
 #if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__)) || (defined(__WATCOMC__) && defined(__NT__))) && !defined(__CYGWIN__)
 #define MPG123_COMPAT_MSVCRT_IO
+#ifndef NO_STRTOK  /* OpenMPT */
 #ifndef INT123_compat_strtok
 #define INT123_compat_strtok(a, b, c) strtok_s((a), (b), (c))
 #endif
-#endif
 #endif  /* OpenMPT */
+#endif
 
 #if defined(MPG123_COMPAT_MSVCRT_IO)
 #if defined(_UCRT)