From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id qooeCurWC2noWyQAWB0awg (envelope-from ) for ; Wed, 05 Nov 2025 17:59:54 -0500 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=oct2025 header.b=iM44sPmm; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 1B82A1E04C; Wed, 05 Nov 2025 17:59:54 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 7F1161E04C for ; Wed, 05 Nov 2025 17:59:53 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 141DF3854804 for ; Wed, 5 Nov 2025 22:59:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 141DF3854804 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=oct2025 header.b=iM44sPmm Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id D237F385C41B for ; Wed, 5 Nov 2025 22:59:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D237F385C41B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D237F385C41B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1762383561; cv=none; b=vjfu6rjSc41VUEjIGFOI0n83vo2VtOgRDgdw4vl+rhFf+AdA96FwooHnCWi/bjz16urQ98ZiNz2PFPSMnkgOrfRdhzAY8m3OOW6eiLc/wHCNWsRtaLIOuFfVTEln08UogeX4U3yJaSUrobwXYsfoPqZs+dnvdZHoq+eN8YJatvY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1762383561; c=relaxed/simple; bh=knz09q6Rsx/YcKj2TcJLetlA76HP/ZZrmgZ6legCrJA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=AporjpEIqRof4xorgjscD5Y0d+Pm4mDZhuFwJkSsQymCrCrsIgnv6Tn0E8RtDcPAvSDJ2admZY1rdetxeBDp2GsCt/379Rnz1fyFcykAXP+frodaiEJTSnYDBQjU2kEnfL+a5ysBmvFQf2MRc3D/Q6vSxtzUSlUlUUtZu/+EEYA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D237F385C41B Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 5A5MxFmF028914 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 5 Nov 2025 17:59:19 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 5A5MxFmF028914 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=oct2025; t=1762383560; bh=fA2Tqa+0IULFfZ98J2zkhCtEu8vG3PZ/zEz/kcvb478=; h=From:To:Cc:Subject:Date:From; b=iM44sPmmEhLgdLtmeY46Q/hHxWNYACGGnV7Akw4mD5RZwy2Lev8/16lKzyQK4fiwU 6ZN+6O9n7mMA/c2apT6fsdOs4xS9TyOZLliPgM2nG1bADyEVSXabMRjZoRPpJFJyYz qXvOVKbe8YIcQLVg2G2RgfchhlCi/TIZKxzzWYkhdDTMB+QEHPeygjTVLA50ZM7bLU Lw1doz9ucaySApZAvWhq/YL806OKeIEABxJD0nK3vt4aJ87ml479Wfr9TWzQ9376Vj Degk2de4ZfxRUWWJRpgPKLVC/We4vLHwXfPxd8jFGhSn2oWHFot8LmE2Zit3DG99bT QF3fHB/vgXp0A== Received: by simark.ca (Postfix) id 0714B1E04C; Wed, 05 Nov 2025 17:59:14 -0500 (EST) From: simon.marchi@polymtl.ca To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH] gdb: fix command_classes name clash Date: Wed, 5 Nov 2025 17:59:11 -0500 Message-ID: <20251105225914.1492360-1-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.51.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Wed, 5 Nov 2025 22:59:15 +0000 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org From: Simon Marchi I currently see this build failure: CXX guile/scm-cmd.o /home/simark/src/binutils-gdb/gdb/guile/scm-cmd.c:551:54: error: ‘const scheme_integer_constant command_classes []’ redeclared as different kind of entity 551 | static const scheme_integer_constant command_classes[] = | ^ In file included from /home/simark/src/binutils-gdb/gdb/defs.h:63, from : /home/simark/src/binutils-gdb/gdb/command.h:71:42: note: previous declaration ‘using command_classes = class enum_flags’ 71 | DEF_ENUM_FLAGS_TYPE (enum command_class, command_classes); | ^~~~~~~~~~~~~~~ /home/simark/src/binutils-gdb/gdb/../gdbsupport/enum-flags.h:58:9: note: in definition of macro ‘DEF_ENUM_FLAGS_TYPE’ 58 | using flags_type = enum_flags; \ | ^~~~~~~~~~ This looks like an unfortunate name clash. Fix it by renaming the variable in scm-cmd.c. Change-Id: I226b052c28eb8d09fd6840337845a387cd818085 --- gdb/guile/scm-cmd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/guile/scm-cmd.c b/gdb/guile/scm-cmd.c index d2172d986187..bfd11917df96 100644 --- a/gdb/guile/scm-cmd.c +++ b/gdb/guile/scm-cmd.c @@ -548,7 +548,7 @@ gdbscm_parse_command_name (const char *name, /* NOTREACHED */ } -static const scheme_integer_constant command_classes[] = +static const scheme_integer_constant scm_command_classes[] = { /* Note: alias and user are special; pseudo appears to be unused, and there is no reason to expose tui, I think. */ @@ -576,9 +576,9 @@ gdbscm_valid_command_class_p (int command_class) { int i; - for (i = 0; command_classes[i].name != NULL; ++i) + for (i = 0; scm_command_classes[i].name != NULL; ++i) { - if (command_classes[i].value == command_class) + if (scm_command_classes[i].value == command_class) return 1; } @@ -903,7 +903,7 @@ gdbscm_initialize_commands (void) = gdbscm_make_smob_type (command_smob_name, sizeof (command_smob)); scm_set_smob_print (command_smob_tag, cmdscm_print_command_smob); - gdbscm_define_integer_constants (command_classes, 1); + gdbscm_define_integer_constants (scm_command_classes, 1); gdbscm_define_functions (command_functions, 1); for (i = 0; i < N_COMPLETERS; ++i) base-commit: 1518f2e087d31997711fc7f4472ab382c24fa903 -- 2.51.2