fixincludes: skip stdio_va_list on modern darwin

Complement to the previous commit in fixincludes
(b1f9ab40cb), for the MacOSX12.3 SDK, it
is necessary to also bypass the stdio_va_list fix. The same bypass is
used, namely, the inclusion of <_stdio.h>.

fixincludes/ChangeLog:

	* fixincl.x: Regenerate.
	* inclhack.def (stdio_va_list): Skip on recent darwin.
This commit is contained in:
Francois-Xavier Coudert
2025-08-15 17:31:07 +02:00
parent 1b34664c62
commit e905d7ee2b
2 changed files with 6 additions and 6 deletions

View File

@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
* It has been AutoGen-ed June 13, 2025 at 01:47:24 PM by AutoGen 5.18.16
* It has been AutoGen-ed August 15, 2025 at 05:30:32 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 13 13:47:24 CEST 2025
/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Aug 15 17:30:32 CEST 2025
*
* You must regenerate it. Use the ./genfixes script.
*
@@ -9019,7 +9019,7 @@ tSCC* apzStdio_Va_ListMachs[] = {
* content bypass pattern - skip fix if pattern found
*/
tSCC zStdio_Va_ListBypass0[] =
"__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list";
"__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list|_stdio.h";
#define STDIO_VA_LIST_TEST_CT 1
static tTestDesc aStdio_Va_ListTests[] = {

View File

@@ -4473,7 +4473,7 @@ fix = {
/*
* Arrange for stdio.h to use stdarg.h to define __gnuc_va_list.
* On 4BSD-derived systems, stdio.h defers to machine/ansi.h, that's
* OK too. modern macOS includes _stdio.h, and does not need the fix.
* OK too. Modern macOS includes _stdio.h, and does not need the fix.
*/
fix = {
hackname = stdio_stdarg_h;
@@ -4499,12 +4499,12 @@ fix = {
* of __gnuc_va_list, __DJ_va_list, or _G_va_list is taken to
* indicate that the header knows what it's doing -- under SUSv2,
* stdio.h is required to define va_list, and we shouldn't break
* that.
* that. Modern macOS includes _stdio.h, and does not need the fix.
*/
fix = {
hackname = stdio_va_list;
files = stdio.h;
bypass = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list';
bypass = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list|_stdio.h';
/*
* On Solaris 10, the definition in
* <stdio.h> is guarded appropriately by the _XPG4 feature macro;