[OMPT-svn-commit] OpenMPT r23423 - in branches/OpenMPT-1.31: . include/mpg123 include/mpg123/ports/generic include/mpg123/src/compat

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

Author: manx
Date: Sat Jun  7 21:54:25 2025
New Revision: 23423
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23423

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

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt
   branches/OpenMPT-1.31/include/mpg123/ports/generic/config.h
   branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h

Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt	Sat Jun  7 21:54:07 2025	(r23422)
+++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt	Sat Jun  7 21:54:25 2025	(r23423)
@@ -3,7 +3,7 @@
  *  `ports/generic/config.h` has been added for build system independent builds.
  *  `src/compat/compat.c` has been modified to silence MSVC static analyzer
     warnings.
- *  `src/compat/compat.c` and `src/compat/compat.c` have been modified to
+ *  `src/compat/compat.c` and `src/compat/compat.h` have been modified to
     exclude unneeded functionality.
  *  Modifications are marked by `// OpenMPT` or `/* OpenMPT */`.
  *  Obviously, unnecessary folders and files have been removed.

Modified: branches/OpenMPT-1.31/include/mpg123/ports/generic/config.h
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/ports/generic/config.h	Sat Jun  7 21:54:07 2025	(r23422)
+++ branches/OpenMPT-1.31/include/mpg123/ports/generic/config.h	Sat Jun  7 21:54:25 2025	(r23423)
@@ -99,6 +99,9 @@
 /* libmpg123 does not care about file mode */
 #define NO_FILEMODE
 
+/* libmpg123 does not care about strtok */
+#define NO_STRTOK
+
 /* We want some frame index, eh? */
 #define FRAME_INDEX 1
 #define INDEX_SIZE 1000

Modified: branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h	Sat Jun  7 21:54:07 2025	(r23422)
+++ branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h	Sat Jun  7 21:54:25 2025	(r23423)
@@ -110,6 +110,7 @@
 
 typedef unsigned char byte;
 
+#ifndef NO_STRTOK  /* OpenMPT */
 // Annoying hackery to select a safe strtok variant. MS decided to call their strtok_r strtok_s, while
 // C11 declares another strtok_s with different prototype. Thanks to you all.
 #ifdef HAVE_STRTOK_R
@@ -122,6 +123,7 @@
 #define INT123_compat_strtok(a, b, c) strtok_s((a), (b), (c))
 #endif
 #endif
+#endif  /* OpenMPT */
 
 #if defined(MPG123_COMPAT_MSVCRT_IO)
 #if defined(_UCRT)
@@ -159,10 +161,12 @@
 #include <io.h>
 #endif
 
+#ifndef NO_STRTOK  /* OpenMPT */
 #ifndef INT123_compat_strtok
 #warning "no safe strtok found"
 #define INT123_compat_strtok(a, b, c) strtok((a), (b))
 #endif
+#endif  /* OpenMPT */
 
 /* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */
 void *INT123_safe_realloc(void *ptr, size_t size);