Skip to content

Commit

Permalink
Merged revision(s) 22066 from trunk/OpenMPT:
Browse files Browse the repository at this point in the history
[Var] mpg123: Update to 1.32.9 (2024-11-02).
........


git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.30@22069 56274372-70c3-4bfc-bfc3-4c3a0b034d27
  • Loading branch information
manxorist committed Nov 2, 2024
1 parent e8822f4 commit 21a71f2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion include/mpg123/OpenMPT.txt
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
9 changes: 8 additions & 1 deletion include/mpg123/src/compat/compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -136,6 +136,13 @@ typedef unsigned char byte;
#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

#if defined(HAVE__SETMODE) || defined(HAVE_SETMODE) || defined(MPG123_COMPAT_MSVCRT_IO)
Expand Down
2 changes: 1 addition & 1 deletion include/mpg123/src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 21a71f2

Please sign in to comment.