From d77dbacdced7ffa8083ac95db458583353b8efca Mon Sep 17 00:00:00 2001
From: "Konstantin Kirik (snegovick)" <snegovick@uprojects.org>
Date: Fri, 9 Jan 2026 02:08:43 +0300
Subject: Fix variable redefinition with different type error reported by gcc
 15

---
 utils/libmach/vcodas.c | 4 ++--
 utils/libmach/vdb.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'utils')

diff --git a/utils/libmach/vcodas.c b/utils/libmach/vcodas.c
index b31fdb3e..96950426 100644
--- a/utils/libmach/vcodas.c
+++ b/utils/libmach/vcodas.c
@@ -274,7 +274,7 @@ static Opcode fopcodes[64] = {
 	"c.ngt.%f",	mipscofpc,
 };
 
-static char fsub[16] = {
+static char _fsub[16] = {
 	's', 'd', 'e', 'q', 'w', '?', '?', '?',
 	'?', '?', '?', '?', '?', '?', '?', '?'
 };
@@ -387,7 +387,7 @@ format(char *mnemonic, Instr *i, char *f)
 			break;
 
 		case 'f':
-			*i->curr++ = fsub[i->rs & 0x0F];
+			*i->curr++ = _fsub[i->rs & 0x0F];
 			break;
 
 		case '\0':
diff --git a/utils/libmach/vdb.c b/utils/libmach/vdb.c
index 55798978..11cbd768 100644
--- a/utils/libmach/vdb.c
+++ b/utils/libmach/vdb.c
@@ -754,7 +754,7 @@ static char *cop0regs[32] = {
 	"TagLo", "TagHi", "ErrorEPC", "31"
 };
 
-static char fsub[16] = {
+static char _fsub[16] = {
 	'F', 'D', 'e', 'q', 'W', '?', '?', '?',
 	'?', '?', '?', '?', '?', '?', '?', '?'
 };
@@ -837,7 +837,7 @@ format(char *mnemonic, Instr *i, char *f)
 			break;
 
 		case 'f':
-			*i->curr++ = fsub[i->rs & 0x0F];
+			*i->curr++ = _fsub[i->rs & 0x0F];
 			break;
 
 		case 'C':
-- 
cgit v1.2.3