fixincludes: add bypass to darwin_objc_runtime_1

Headers are now fixed in the macOS 15 SDK, and the fix should be
bypassed there.

fixincludes/ChangeLog:

	* fixincl.x: Regenerate.
	* inclhack.def (darwin_objc_runtime_1): Add bypass.
This commit is contained in:
Francois-Xavier Coudert 2024-07-10 14:50:38 +02:00
parent 2d1f68e796
commit 8326956159
2 changed files with 12 additions and 4 deletions

View File

@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
* It has been AutoGen-ed June 27, 2024 at 06:52:39 PM by AutoGen 5.18.16
* It has been AutoGen-ed July 10, 2024 at 02:49:05 PM by AutoGen 5.18.16
* From the definitions inclhack.def
* and the template file fixincl
*/
/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Jun 27 18:52:39 CEST 2024
/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Jul 10 14:49:05 CEST 2024
*
* You must regenerate it. Use the ./genfixes script.
*
@ -3124,8 +3124,15 @@ objc_enumerateClasses.*\n\
.*\n\
.*OBJC_REFINED_FOR_SWIFT.*";
#define DARWIN_OBJC_RUNTIME_1_TEST_CT 1
/*
* content bypass pattern - skip fix if pattern found
*/
tSCC zDarwin_Objc_Runtime_1Bypass0[] =
"#ifdef __BLOCKS__";
#define DARWIN_OBJC_RUNTIME_1_TEST_CT 2
static tTestDesc aDarwin_Objc_Runtime_1Tests[] = {
{ TT_NEGREP, zDarwin_Objc_Runtime_1Bypass0, (regex_t*)NULL },
{ TT_EGREP, zDarwin_Objc_Runtime_1Select0, (regex_t*)NULL }, };
/*
@ -11195,7 +11202,7 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
#define REGEX_COUNT 317
#define REGEX_COUNT 318
#define MACH_LIST_SIZE_LIMIT 187
#define FIX_COUNT 274

View File

@ -1512,6 +1512,7 @@ fix = {
.*
.*OBJC_REFINED_FOR_SWIFT.*
_EOSelect_;
bypass = "#ifdef __BLOCKS__";
c_fix = format;
c_fix_arg = "#if __BLOCKS__\n%0\n#endif";
test_text = <<- _OBJC_RUNTIME_1