[dosemu] Support C23: avoid keyword usage

commit 217af86ed579e4e45a9b0562215946eeeba6beae Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org&gt; Date: Fri Jan 31 12:03:52 2025 +0900 Support C23: avoid keyword usage dosemu-1.4.0.8-c23-keyword.patch | 28 ++++++++++++++++++++++++++++ dosemu.spec | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) --- diff --git a/dosemu-1.4.0.8-c23-keyword.patch b/dosemu-1.4.0.8-c23-keyword.patch new file mode 100644 index 0000000..282a75f --- /dev/null +++ b/dosemu-1.4.0.8-c23-keyword.patch @@ -0,0 +1,28 @@ +diff --git a/src/arch/linux/dosext/sound/midid/midid.h b/src/arch/linux/dosext/sound/midid/midid.h +index faca5e7f..8369178b 100644 +--- a/src/arch/linux/dosext/sound/midid/midid.h ++++ b/src/arch/linux/dosext/sound/midid/midid.h +@@ -8,7 +8,7 @@ + #define _MIDID_H + + typedef unsigned char byte; +-typedef enum {FALSE, TRUE} bool; ++typedef enum {FALSE, TRUE} enum_bool; + typedef enum {EMUMODE_MT32, EMUMODE_GM} Emumode; + + /* Configuration */ +diff --git a/src/base/init/parser.y.in b/src/base/init/parser.y.in +index 06b52c85..5993bb75 100644 +--- a/src/base/init/parser.y.in ++++ b/src/base/init/parser.y.in +@@ -92,8 +92,8 @@ int dexe_running = 0; + static int dexe_forbid_disk = 1; + char own_hostname[128]; + +-static struct printer nullptr; +-static struct printer *pptr = &nullptr; ++static struct printer printer_nullptr; ++static struct printer *pptr = &printer_nullptr; + static int c_printers = 0; + + static int ports_permission = IO_RDWR; diff --git a/dosemu.spec b/dosemu.spec index 6867617..058d20a 100644 --- a/dosemu.spec +++ b/dosemu.spec @@ -1,6 +1,6 @@ Name: dosemu Version: 1.4.0.8 -Release: 37.20131022git%{?dist} +Release: 38.20131022git%{?dist} Summary: DOS Emulator for Linux URL: http://dosemu.sf.net License: GPLv2+ @@ -24,6 +24,8 @@ Source: %{name}-%{version}.tgz # https://bugzilla.rpmfusion.org/show_bug.cgi?id=5663 # memory.h: don't mark pointer to be modified as const Patch0: 0001-memory.h-don-t-mark-pointer-to-be-modified-as-const.patch +# C23: avoid keyword usage +Patch1: dosemu-1.4.0.8-c23-keyword.patch # Made a FreeDOS bootable image, must be done manually. @@ -126,6 +128,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog +* Fri Jan 31 2025 Mamoru TASAKA <mtasaka(a)fedoraproject.org&gt; - 1.4.0.8-38.20131022git +- Support C23: avoid keyword usage + * Tue Jan 28 2025 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 1.4.0.8-37.20131022git - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild