tags 1097487 + patch
user [email protected]
usertags 1097487 + bsp-2025-10-brazil
thanks

On Monday, February 17 2025, Matthias Klose wrote:

> The package fails to build in a test rebuild on at least amd64 with
> gcc-15/g++-15, but succeeds to build with gcc-14/g++-14. The
> severity of this report will be raised before the forky release.
[...]

Hi,

The attached patch fixes the bug.  The package uses single-debian-patch,
and I don't have time right now to learn how to create an NMU with this
approach, sorry.

Let me know if you have any questions!

Thanks,

-- 
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF  31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
https://sergiodj.net/

From: Sergio Durigan Junior <[email protected]>
Date: Sat, 27 Sep 2025 13:05:15 -0400
Subject: Declare some vars as int instead of bool

This fixes an FTBFS with GCC 15.

Forwarded: no
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1097487
---
 src/emulator/data.h | 10 +++-------
 src/emulator/loop.c |  6 +++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/emulator/data.h b/src/emulator/data.h
index df652ce..511a7ea 100644
--- a/src/emulator/data.h
+++ b/src/emulator/data.h
@@ -33,10 +33,6 @@
 #include "config.h"
 #include "threads.h"
 
-#ifndef bool
-typedef int bool;
-#endif
-
 #ifndef false
 #define false	0
 #define true	1
@@ -128,8 +124,8 @@ extern bool dump_flag;
 extern bool gc_before_dump;
 
 extern int trace_gc;
-extern bool trace_traps;
-extern bool batch_mode;
+extern int trace_traps;
+extern int batch_mode;
 
 #ifndef FAST
 
@@ -146,7 +142,7 @@ extern bool trace_mcache;
 
 #endif
 
-extern bool trace_files;
+extern int trace_files;
 
 
 /* miscellanous */
diff --git a/src/emulator/loop.c b/src/emulator/loop.c
index f31b8d4..8b0dba9 100644
--- a/src/emulator/loop.c
+++ b/src/emulator/loop.c
@@ -50,9 +50,9 @@
 
 #define ENABLE_TIMER	1
 
-bool trace_traps = false;	/* trace tag traps */
-bool trace_files = false;	/* trace file opening */
-bool batch_mode = false;	/* disable trapping of SIGINT */
+int trace_traps = 0;	/* trace tag traps */
+int trace_files = 0;	/* trace file opening */
+int batch_mode = 0;	/* disable trapping of SIGINT */
 
 #ifndef FAST
 bool trace_insts = false;	/* trace instruction execution */

Attachment: signature.asc
Description: PGP signature

Reply via email to