From: <sv...@op...> - 2024-10-28 14:43:52
|
Author: manx Date: Mon Oct 28 15:43:38 2024 New Revision: 22022 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22022 Log: Merged revision(s) 22021 from trunk/OpenMPT: [Fix] mpg123: Fix DJGPP compatibility. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt branches/OpenMPT-1.31/include/mpg123/src/compat/compat.c Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Mon Oct 28 15:43:02 2024 (r22021) +++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Mon Oct 28 15:43:38 2024 (r22022) @@ -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`. + * `src/compat/compat.c` has been modified for DJGPP compatibility. * 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.31/include/mpg123/src/compat/compat.c ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/compat/compat.c Mon Oct 28 15:43:02 2024 (r22021) +++ branches/OpenMPT-1.31/include/mpg123/src/compat/compat.c Mon Oct 28 15:43:38 2024 (r22022) @@ -10,8 +10,10 @@ */ #include "config.h" +#if !defined(__DJGPP__) /* OpenMPT */ /* This source file does need _POSIX_SOURCE to get some sigaction. */ #define _POSIX_SOURCE +#endif /* OpenMPT */ #include "compat.h" #ifdef _MSC_VER |