From: Francois-Xavier Coudert Date: Thu, 27 Jun 2024 16:55:22 +0000 (+0200) Subject: fixincludes: adjust stdio fix for macOS 15 headers X-Git-Tag: releases/gcc-14.3.0~89 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfed396d6a0e9c1450d5a9ccf63d38799e87a8fc;p=thirdparty%2Fgcc.git fixincludes: adjust stdio fix for macOS 15 headers fixincludes/ChangeLog: * fixincl.x: Regenerate. * inclhack.def (apple_local_stdio_fn_deprecation): Also apply to _stdio.h. (cherry picked from commit 1dc143181550573c9c902fb7a3b495e9b409d0b0) --- diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index e52f11d8460..45d65f4872a 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed August 17, 2023 at 10:16:38 AM by AutoGen 5.18.12 + * It has been AutoGen-ed April 1, 2025 at 03:28:07 PM by AutoGen 5.18.16 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Aug 17 10:16:38 CEST 2023 +/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Apr 1 15:28:07 BST 2025 * * You must regenerate it. Use the ./genfixes script. * @@ -2619,7 +2619,7 @@ tSCC zApple_Local_Stdio_Fn_DeprecationName[] = * File name selection pattern */ tSCC zApple_Local_Stdio_Fn_DeprecationList[] = - "stdio.h\0"; + "stdio.h\0_stdio.h\0"; /* * Machine/OS name selection pattern */ diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 19e0ea2df66..67a1082f926 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -1273,6 +1273,7 @@ fix = { hackname = apple_local_stdio_fn_deprecation; mach = "*-*-*darwin2*"; files = stdio.h; + files = _stdio.h; select = "__deprecated_msg([^\n]*)$"; c_fix = format; c_fix_arg = "#if defined(__APPLE_LOCAL_DEPRECATIONS)\n"