[OMPT-svn-commit] OpenMPT r20234 - in branches/OpenMPT-1.29: . include/mpg123 include/mpg123/src/libmpg123

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

Author: manx
Date: Mon Mar  4 11:30:36 2024
New Revision: 20234
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20234

Log:
Merged revision(s) 20231 from trunk/OpenMPT:
[Fix] mpg123: Fix warning in debug builds. See <https://sourceforge.net/p/mpg123/bugs/371/>.
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt
   branches/OpenMPT-1.29/include/mpg123/src/libmpg123/readers.c

Modified: branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt	Mon Mar  4 11:30:13 2024	(r20233)
+++ branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt	Mon Mar  4 11:30:36 2024	(r20234)
@@ -6,6 +6,7 @@
  *  `ports/Xcode/config.h` has been modified to let the build system set
     `OPT_*`.
  *  `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`.
+ *  A warning in `src/libmpg123/readers.c` has been fixed.
  *  Modifications are marked by `// OpenMPT` or `/* OpenMPT */`.
  *  Obviously, unnecessary folders and files have been removed.
  *  For building, premake is used to generate Visual Studio project files.

Modified: branches/OpenMPT-1.29/include/mpg123/src/libmpg123/readers.c
==============================================================================
--- branches/OpenMPT-1.29/include/mpg123/src/libmpg123/readers.c	Mon Mar  4 11:30:13 2024	(r20233)
+++ branches/OpenMPT-1.29/include/mpg123/src/libmpg123/readers.c	Mon Mar  4 11:30:36 2024	(r20234)
@@ -732,8 +732,13 @@
 		bc->pos  -= b->size;
 		bc->size -= b->size;
 
+#if 1  /* OpenMPT */
+		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%"PRIi64  /* OpenMPT */
+		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);  /* OpenMPT */
+#else  /* OpenMPT */
 		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%td"
 		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);
+#endif  /* OpenMPT */
 
 		bc_free(bc, b);
 		b = n;