[gcc r15-1697] fixincludes: adjust stdio fix for macOS 15 headers

François-Xavier Coudert fxcoudert@gcc.gnu.org
Thu Jun 27 17:15:01 GMT 2024


https://gcc.gnu.org/g:1dc143181550573c9c902fb7a3b495e9b409d0b0

commit r15-1697-g1dc143181550573c9c902fb7a3b495e9b409d0b0
Author: Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
Date:   Thu Jun 27 18:55:22 2024 +0200

    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.

Diff:
---
 fixincludes/fixincl.x    | 6 +++---
 fixincludes/inclhack.def | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 54a530b50ca..fb9950d9b21 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  June  7, 2024 at 11:03:58 AM by AutoGen 5.18.16
+ * It has been AutoGen-ed  June 27, 2024 at 06:52:39 PM by AutoGen 5.18.16
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Jun  7 11:03:58 CEST 2024
+/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Jun 27 18:52:39 CEST 2024
  *
  * 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 f7fc5cdbabd..9f4a41199a1 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"


More information about the Gcc-cvs mailing list