From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id Ut6jE4sVw2hOdgAAWB0awg (envelope-from ) for ; Thu, 11 Sep 2025 14:31:39 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=xmos1.onmicrosoft.com header.i=@xmos1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-xmos1-onmicrosoft-com header.b=XVY4NN0Y; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 407CA1E04C; Thu, 11 Sep 2025 14:31:39 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,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 6A8181E04C for ; Thu, 11 Sep 2025 14:31:38 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BC2543858C31 for ; Thu, 11 Sep 2025 18:31:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BC2543858C31 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=xmos1.onmicrosoft.com header.i=@xmos1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-xmos1-onmicrosoft-com header.b=XVY4NN0Y Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11020081.outbound.protection.outlook.com [52.101.84.81]) by sourceware.org (Postfix) with ESMTPS id 3F2563858C42 for ; Thu, 11 Sep 2025 18:30:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3F2563858C42 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=xmos.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=xmos.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3F2563858C42 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=52.101.84.81 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1757615433; cv=pass; b=ZEmLA2OaAZBgXJ+lcLMt3FcxSlE5BmK17sE/dJCgdMiEtf+pSlwUCG+YIUenk8ewn2y49ETEsaehRTUoSlwWvvHhz910vyITONXGA0VhT2Lay1I0kUJLZrkII4ZU+B/O+KsPDjUyCuntTYEw5YJUvfdVc7sFSuJxLxqU7Yv+hA0= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1757615433; c=relaxed/simple; bh=5TeJc2DUE6iMsfKfT8oBuR8HnjWmyUnKBGeIHWO9uMc=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=cQEvcBn3HD/cU/KaqzRA3gTlJrqft7bVMQQJPGpyTDGE/ngH4wD1dQpm+ypwBR7Os7OtJv22eh/DQ3tzCNCkIvTPFoFM9F5BgP4dUbEGhGnPR2daZ4rye6aECT76El2cMlN8b9L9w8yqBkIcNKoeWvUJRty/3aL9XfWFL9qeHdg= ARC-Authentication-Results: i=2; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3F2563858C42 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lYmmYFZgO/8N++H1/PY71x/Cx5bj31/tBjD7tonFfRpwWRaRWQR5XO19EuRVjezc0XjZyY1FUunvVTfM9vmKGNtYhASwoYv15zlcDHA+a3MRwrhapzPDs5+8NfSguWKeQ/MrUqbP1GtWVHEYb360gRxfIGpS9ei26/FjquWgPzVIn8TIXYO2pMR64myj455ZAfQpHUyjmqVzN3oYfNTZ9IfRSDNicLEC1bZipT/kcaAR71UNWoSgWZW7YFzMrI72xToXo6VDjZ4AwwQ1V7hbW+OOEwrCddj0I7ch+d0osiwA86nuMMto8A2jg2NqirN3cq74wln9NmUj/GxQg63jAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ChqeElBtS7u4BEabLDL1NtjoPtTW/IyCLW7d4ZvLlJU=; b=oy6CcBpDO7NK5NfIfrebhZH3ilS2N9DlZkbpiGF9065Eb1EAGfWVixABuV1rJiFjpVmoPLMp1jh5uQRYbJpwB08QsMsxR6EcgDE59hlh3Yqi/4nUIPnOuXWtwdhMpx3un7nX6NFa5pkUMaJoFfmi0euzYUKsclLOUja20SKnWr2U2PFM/b/MO+j2PnPb1mJPo6jStmCE7AFEhjVGxME0EKrp/KlLhQJIthxNO39lLU2FdiGN7H112ByLbZyJuKMoWWOEFVfQ5Gmbjoy5SaAxbME5urPUl128t4wTA+gBBOH9kyVepau0iSfrZ9zl/yF+2Q89LEfeoOAcqiKK6fnNYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=xmos.com; dmarc=pass action=none header.from=xmos.com; dkim=pass header.d=xmos.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xmos1.onmicrosoft.com; s=selector2-xmos1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ChqeElBtS7u4BEabLDL1NtjoPtTW/IyCLW7d4ZvLlJU=; b=XVY4NN0YJq9wgIru/F+WaJlsxM5F+YMck8X0WyPTAazUIelzlNaousBHZv/zuGKFSbdKAUxqhdyjHkOHRDQgyttcD7FE232oDt/B0BiLJINiTR4BNSrjSsHwjJvtVyZcnm5XR4TOq6PFtG2e7rwrpMJXglkj9Kdd+I+TIjxKm5Q= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=xmos.com; Received: from AS8PR09MB5303.eurprd09.prod.outlook.com (2603:10a6:20b:374::5) by VI0PR09MB7047.eurprd09.prod.outlook.com (2603:10a6:800:245::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9094.22; Thu, 11 Sep 2025 18:30:29 +0000 Received: from AS8PR09MB5303.eurprd09.prod.outlook.com ([fe80::1ea1:e219:22:9bd3]) by AS8PR09MB5303.eurprd09.prod.outlook.com ([fe80::1ea1:e219:22:9bd3%4]) with mapi id 15.20.9094.021; Thu, 11 Sep 2025 18:30:29 +0000 From: Ciaran Woodward To: gdb-patches@sourceware.org Cc: Ciaran Woodward Subject: [PATCH 1/1] gdb/tui: Fix build for older ncurses Date: Thu, 11 Sep 2025 19:30:21 +0100 Message-Id: <20250911183021.17844-1-ciaranwoodward@xmos.com> X-Mailer: git-send-email 2.25.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LO3P265CA0033.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:387::16) To AS8PR09MB5303.eurprd09.prod.outlook.com (2603:10a6:20b:374::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR09MB5303:EE_|VI0PR09MB7047:EE_ X-MS-Office365-Filtering-Correlation-Id: a7b32107-8cca-41b1-b52f-08ddf16148f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?pkyn4Ik8sEU7aUVlC8eXCBXM7CleJRzzsGPdh9MDdMdj5uFJxGLBEdSQh2P7?= =?us-ascii?Q?/bNVn7BYUjaQCx4wdlTnYT+vINZluXId0mp3cQELi+Z1CJB8XsQCsVNrh3lT?= =?us-ascii?Q?sMGYyWnTXSrVLVq9Nd3Eq3Lap2z/4gmQ1uiZxh2CIVoobMLJOy0Be/gvZenj?= =?us-ascii?Q?oWPjrlSFpre+IBCy8pwzuKlcq8rpg8Qmz4bXrcXVcu4PgJnP61v8A0Hj6b5d?= =?us-ascii?Q?xyOCCHW2VleSwpNmjO2kuUu/P7olbKmzsP7HFWL+TYGr/CjwU+xVSXGaURFa?= =?us-ascii?Q?sENLNaTWZ2bntZzbII/+n/Fe1dIkG4kHNomOVZ/3VclvRgtE+b/At8akcKQK?= =?us-ascii?Q?x61xt2ezIaX3zlVpX+wddsB9me9Q2NQyVvrK+NnX/jtsmRBuUuO3HnhKZ+oU?= =?us-ascii?Q?cRekmlrnM1LFb/8vhJuldgKPu0/PYST2AMkCSIiadc4cpwlz+skB/wxsAyYl?= =?us-ascii?Q?zo1D+qZjGm/E61JkgAm8HqxHu7Pnh1OdO3bHiW1qqCBOZ61HwdxOwskY9wB+?= =?us-ascii?Q?ZUCg/kcG5djjhn8873HQ3HnY73IU8SaXaZHS7+27h9W07zd8iC9YdZYBoh04?= =?us-ascii?Q?Nqzy5D/QYzFbS03XyM29ytPrGh1o85uCp4/129tqRwm9KMXQcQiPab1FVTzE?= =?us-ascii?Q?/IBV1O1mac1rPYqjbjNYbE6qAlym//hUw6p2I+S1Q9M1s5EmwQDrbFcaLuMO?= =?us-ascii?Q?jKA8nbiUvsUJzylmBX6+tyiGwD2V/XDzToQmv2GbEg4zehjon821fqHmI0xc?= =?us-ascii?Q?EQFvgGjrDIwkNxdI8oNGv+ToAc0RcT0Ao0QhwgIhB4WU9ShKN473n6XZPLyt?= =?us-ascii?Q?LtthVQWrEcDVFLqyrZU3rOmBTE5hdlhXaxRmdZNQ69W4M9qWF8B3ZPJy4TIM?= =?us-ascii?Q?yDdKpgfHZkl1LkKfDI0XDm1bShE5rl+UVXrapNX4VrLwJkSkvETAjWC2tXI/?= =?us-ascii?Q?u9IRaoX+t+SogkK/4TmizZ+CAC6tHhAwd6A6uCrZ5dcr5OCq3CO4L7Hx/7ED?= =?us-ascii?Q?mxAdtC9RuU+in7fd1yErtIGqk2iC+EwmAZHTgRQS9AF6Db7wclFtKPx+dOX/?= =?us-ascii?Q?3TGL6/imhaW0X1Vn/ljurdNIiUxMcoJ8hZK21mr3APf5CA/UDkZ/RgzOTtpF?= =?us-ascii?Q?VFPCXWtxss2WYQw9mbtCOe89B6L+N6G75Re/G05CmPEWTShSNmNvR2mC1MS5?= =?us-ascii?Q?DOoXsTLabA2TzyuMon+cR28wHbGDmhMg/CFirPoujfQz96QW5ThqnqwP1xDm?= =?us-ascii?Q?O91uabvhHNdUChxjezuhjBEQ4+3F5AHl7YPObkjQZbInyz5svnXvHrigoQ9I?= =?us-ascii?Q?lsrzGWnx83O2eF5JoDEb6eFD/DK8dRpoE+AZlZ6xp/wyrj0jmyjsQiRYeiNM?= =?us-ascii?Q?OsHXs7CTuzQw1AcgLSSWEAf4AtMbJk7PFiBH+mUSqTLU8hvi/4RS6JgGtHsZ?= =?us-ascii?Q?is5oVWyqZF3yLxO49JYB/PtMkok+ES0uiVfcpGLBoCS/V65RymHPsiMy9t+W?= =?us-ascii?Q?dLbowWb2bM0BDks=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR09MB5303.eurprd09.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(1800799024)(52116014)(366016)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0Z7MxNATJ3CA5FRDbCZhVt8SCWvUrbT9Vv8SgbvWEdNqKKTXyM3XeI3f4y7T?= =?us-ascii?Q?lZMUVy1o6r8RcbcjeYNmQQZzFC89sXncXWqxdxOCBFlD5Kee52qA/Xiwds+b?= =?us-ascii?Q?eeiRNDoOWE+RoF3bBbC1wqE/13N8AECXL/fy2UH5TjCOIiXciUXfPxGHlwQE?= =?us-ascii?Q?3mh8zTKbXGw4fOwXg2+RGWCu6i6B3rHhBjMl24vMHAKMUFPvbpJbXmj5uljO?= =?us-ascii?Q?n8RmqNwdU2t2bzya37/7xOtPRrz3DMOiM5HfKnjmQSnMeb4EIKTSbvlZaDAq?= =?us-ascii?Q?8EaUSZmljsjpxN6+owaPeWTS3RuV+XQZGbVihUMF3szl5mmRBANvKtwQW9Tz?= =?us-ascii?Q?o6oHitzgmOfNjBkAOTRWh5jWUuSAzWbnrfiR6k7C6QgMoQuxA0Td0PsV1YTC?= =?us-ascii?Q?N/i3kMqA72z1Kbxz0NtSwU9Uusy1XdkfKqjlWnYCvL369t8ry6+O1GtLhOpA?= =?us-ascii?Q?1n2ZsTOFlE2o/MQmjNogJLCj1iFFAKol0LcQBbdmlKXd/46qEHoOLUWg7MB1?= =?us-ascii?Q?79TlWQESltXU8ArwB29l3RwMj9FiE29zVITo790vZnqLHgEs3jJ2ZjApmE/5?= =?us-ascii?Q?wzmeOKP3jD2QSiZQtr7J6mZjlWCzx84dKALA3DHbIMxkeLG9c+/RQ5dBQOd8?= =?us-ascii?Q?Ic5cF1rVUtmPJs6eckXHbV8mYj/Zqk2J6leWLIOuub5ubx8Zf1cHgJTcE24A?= =?us-ascii?Q?0eAgITa6Nk5rCpdovB+rPa4jrJT9lGOS1EB7Rp9jJQOR/1gVcptLW0e6xHIN?= =?us-ascii?Q?ToYmsnc9TCzUKK4EqjZ2pZ/+yr9es7bLjJkeiNGxFg/kyGLUq5nLH5wWCM79?= =?us-ascii?Q?QspJVa1UO5tIePCpNzARKn85GKEY9oCkiEl8qtYcF8FVl7ty0J1qcqOPHFOA?= =?us-ascii?Q?OXmVMn4wXQ7MfF3ngWuAZ8QF8hO0SxL4JIkTe53L1s436z6CyEykcs0reToK?= =?us-ascii?Q?EAn3BiHz2DeoKlQqIJfpwVuneaMe1Lrfc/DvNcuRcY+8gcI/gvsCk7aM3JFm?= =?us-ascii?Q?gIC3HjDOcSsgBymXT+L2yLMBbfGXJt5qiiMn+5PICXCJyyZ0+IxuB0DxhW1v?= =?us-ascii?Q?Uv5DE4/I+dS5sxU8VJHPi6Dr8506vaOIQZ7Yv/GdoVg0Bw9Ht6xY1mKrESAO?= =?us-ascii?Q?1e+8TBVUbFPkwJSubmE7dUkHE7xJOeYgmd4cnwdmxOusX9w4noZhQOHPw1C4?= =?us-ascii?Q?Uf4i2JAaGebjQWYLptFDopcCpKaRauwbG5laN2oeWdeLuqMHPkynaohtkFbI?= =?us-ascii?Q?YopuUlZNFYyZi7FxyYM149S9L1bJ1dKTGHc75FTyrnXoLPMh1UFMMxn3/y11?= =?us-ascii?Q?YZ0snU+lctPSchJBOQ5XG5rulbXx7XGl7F27yHd+mw+pbcXLVkU+x8+MPoXW?= =?us-ascii?Q?odzSJqQvtxsoV+rcXR4GRfE9MxHN1FYxD0EUIhNcFp3K6GG+2UXPsVwV5yWn?= =?us-ascii?Q?1BAOBq61NG9QM+NOSLOjt3cJ3GYT9t4KZ5zSC5gvAxG6/hONohSI0d4C5piz?= =?us-ascii?Q?4N/WowGWN3IpIYfZqxn/WZQliMpMaZlZszT5kxVo2KSELvgZv/eYHKnGWUQy?= =?us-ascii?Q?mNbG1U6QRDp8DHw/Iz2HcVCcCz92djFp9PliruKh3+4m1zAEsFyI6OHJRA0n?= =?us-ascii?Q?8Q=3D=3D?= X-OriginatorOrg: xmos.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7b32107-8cca-41b1-b52f-08ddf16148f5 X-MS-Exchange-CrossTenant-AuthSource: AS8PR09MB5303.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2025 18:30:29.6729 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 975ecfb1-4080-42d2-a01d-4a4d0707a539 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4U6z3nONjaWv4dcohVscLcUSwciaBx0bjmeLwBtyHtXWgwgmLrOsY1Ss4DsQumUhIdi4Gpgh/2+YPlPaa1NYhg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR09MB7047 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 Older versions of ncurses (including the version that ships inside macos, and Centos 7) do not include the A_ITALIC macro. This patch simply hides any use of A_ITALIC behind a preprocessor guard. The result of this is that italics won't be rendered in the tui if ncurses isn't supported. We do have other options if we think it's important - for instance we could show italics as bold if italics aren't supported. From my understanding, that might be overthinking it - so I took the simplest approach here, just to fix the build. Those versions also define tgetnum as: int tgetnum(char *id); so attempting to compile for c++ results in the error: ISO C++ forbids converting a string constant to 'char*' [-Werror=write-strings] This is just a dated API issue, so a const cast resolves the issue. --- gdb/tui/tui-io.c | 4 ++++ gdb/ui-style.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index c97e8fd1717..84cad9366d5 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -319,7 +319,9 @@ tui_apply_style (WINDOW *w, ui_file_style style) wattron (w, A_NORMAL); wattroff (w, A_BOLD); wattroff (w, A_DIM); +#ifdef A_ITALIC wattroff (w, A_ITALIC); +#endif wattroff (w, A_UNDERLINE); wattroff (w, A_REVERSE); if (last_color_pair != -1) @@ -368,8 +370,10 @@ tui_apply_style (WINDOW *w, ui_file_style style) gdb_assert_not_reached ("invalid intensity"); } +#ifdef A_ITALIC if (style.is_italic ()) wattron (w, A_ITALIC); +#endif if (style.is_underline ()) wattron (w, A_UNDERLINE); diff --git a/gdb/ui-style.c b/gdb/ui-style.c index 9a58e4dd2ae..ccc9094ca59 100644 --- a/gdb/ui-style.c +++ b/gdb/ui-style.c @@ -594,7 +594,7 @@ colorsupport () { std::vector result = {color_space::MONOCHROME}; - int colors = tgetnum ("Co"); + int colors = tgetnum (const_cast ("Co")); if (colors >= 8) result.push_back (color_space::ANSI_8COLOR); if (colors >= 16) -- 2.25.1