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

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

Author: manx
Date: Sat Nov  2 12:39:05 2024
New Revision: 22067
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22067

Log:
Merged revision(s) 22066 from trunk/OpenMPT:
[Var] mpg123: Update to 1.32.9 (2024-11-02).
........

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

Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt	Sat Nov  2 12:38:30 2024	(r22066)
+++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt	Sat Nov  2 12:39:05 2024	(r22067)
@@ -1,4 +1,4 @@
-libmpg123 library version 1.32.9-dev+r5448 (2024-10-28).
+libmpg123 library version 1.32.9 (2024-11-02).
 The following changes have been made:
  *  `ports/makefile/config.h` has been added for plain `Makefile` builds.
  *  `ports/MSVC++/config.h` has been added for MSVC builds.

Modified: branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h	Sat Nov  2 12:38:30 2024	(r22066)
+++ branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h	Sat Nov  2 12:39:05 2024	(r22067)
@@ -110,7 +110,7 @@
 
 typedef unsigned char byte;
 
-#if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__))) && !defined(__CYGWIN__)
+#if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__)) || (defined(__WATCOMC__) && defined(__NT__))) && !defined(__CYGWIN__)
 #define MPG123_COMPAT_MSVCRT_IO
 #endif
 
@@ -134,6 +134,13 @@
 #ifndef MPG123_COMPAT_MSVCRT_IO_64
 #define MPG123_COMPAT_MSVCRT_IO_64
 #endif
+#endif
+#endif
+#if defined(__WATCOMC__) && defined(__NT__)
+#if (__WATCOMC__ >= 1100)
+#ifndef MPG123_COMPAT_MSVCRT_IO_64
+#define MPG123_COMPAT_MSVCRT_IO_64
+#endif
 #endif
 #endif
 #endif

Modified: branches/OpenMPT-1.31/include/mpg123/src/version.h
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/version.h	Sat Nov  2 12:38:30 2024	(r22066)
+++ branches/OpenMPT-1.31/include/mpg123/src/version.h	Sat Nov  2 12:39:05 2024	(r22067)
@@ -19,7 +19,7 @@
 #define MPG123_PATCH 9
 // Don't get too wild with that to avoid confusing m4. No brackets.
 // Also, it should fit well into a sane file name for the tarball.
-#define MPG123_SUFFIX "-dev"
+#define MPG123_SUFFIX ""
 
 #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "."  #b  "." #c
 #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c)