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

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

Author: manx
Date: Sat Jan  4 15:02:27 2025
New Revision: 22782
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22782

Log:
Merged revision(s) 22772, 22779 from trunk/OpenMPT:
[Ref] mpg123: Add generic config.h.
........
[Fix] mpg123: Fix DJGPP build.
........

Added:
   branches/OpenMPT-1.31/include/mpg123/ports/generic/
      - copied from r22772, trunk/OpenMPT/include/mpg123/ports/generic/
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

Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt	Sat Jan  4 12:35:40 2025	(r22781)
+++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt	Sat Jan  4 15:02:27 2025	(r22782)
@@ -1,5 +1,6 @@
 libmpg123 library version 1.32.10 (2024-12-14).
 The following changes have been made:
+ *  `ports/generic/config.h` has been added for build system independent builds.
  *  `ports/makefile/config.h` has been added for plain `Makefile` builds.
  *  `ports/MSVC++/config.h` has been added for MSVC builds.
  *  `ports/Xcode/config.h` has been retained from older versions.

Modified: branches/OpenMPT-1.31/include/mpg123/ports/generic/config.h
==============================================================================
--- trunk/OpenMPT/include/mpg123/ports/generic/config.h	Sat Jan  4 09:06:18 2025	(r22772)
+++ branches/OpenMPT-1.31/include/mpg123/ports/generic/config.h	Sat Jan  4 15:02:27 2025	(r22782)
@@ -52,7 +52,9 @@
 /* yeah, POSIX ... */
 
 #if defined(HAVE_POSIX_CRT)
-#if defined(_FILE_OFFSET_BITS)
+#if defined(__DJGPP__)
+#define SIZEOF_OFF_T 4
+#elif defined(_FILE_OFFSET_BITS)
 #if (_FILE_OFFSET_BITS == 64)
 #define SIZEOF_OFF_T 8
 #elif (_FILE_OFFSET_BITS == 32)
@@ -77,8 +79,6 @@
 #endif
 #elif defined(HAVE_MS_CRT)
 #define SIZEOF_OFF_T 4
-#elif defined(__DJGPP__)
-#define SIZEOF_OFF_T 4
 #else
 #define SIZEOF_OFF_T 8
 #endif