diff options
Diffstat (limited to 'fixincludes/fixincl.x')
| -rw-r--r-- | fixincludes/fixincl.x | 338 |
1 files changed, 333 insertions, 5 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 2eabf1f572e..0a93761f15e 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 Friday November 26, 2004 at 09:59:26 PM UTC + * It has been AutoGen-ed Thursday April 7, 2005 at 12:17:27 PM PDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Nov 26 21:59:26 UTC 2004 +/* DO NOT CVS-MERGE THIS FILE, EITHER Thu Apr 7 12:17:27 PDT 2005 * * You must regenerate it. Use the ./genfixes script. * @@ -15,7 +15,7 @@ * certain ANSI-incompatible system header files which are fixed to work * correctly with ANSI C and placed in a directory that GNU C will search. * - * This file contains 177 fixup descriptions. + * This file contains 184 fixup descriptions. * * See README for more information. * @@ -42,6 +42,50 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Aab_Darwin_Fenv_H fix + */ +tSCC zAab_Darwin_Fenv_HName[] = + "AAB_darwin_fenv_h"; + +/* + * File name selection pattern + */ +tSCC zAab_Darwin_Fenv_HList[] = + "|fenv.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAab_Darwin_Fenv_HMachs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zAab_Darwin_Fenv_HBypass0[] = + "#pragma GCC fenv"; + +#define AAB_DARWIN_FENV_H_TEST_CT 1 +static tTestDesc aAab_Darwin_Fenv_HTests[] = { + { TT_NEGREP, zAab_Darwin_Fenv_HBypass0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aab_Darwin_Fenv_H + */ +static const char* apzAab_Darwin_Fenv_HPatch[] = { +"/* This file is a backwards compability hack to allow \n\ + no-trapping-math to be the default. */\n\ +#ifndef _DARWIN_FENV_H_WRAPPER\n\ +#if defined(__GNUC__) && __GNUC__ >= 4\n\ +#pragma GCC fenv\n\ +#endif\n\ +#include_next <fenv.h>\n\ +#define _DARWIN_FENV_H_WRAPPER\n\ +#endif /* _DARWIN_FENV_H_WRAPPER */", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Aab_Fd_Zero_Asm_Posix_Types_H fix */ tSCC zAab_Fd_Zero_Asm_Posix_Types_HName[] = @@ -1720,6 +1764,46 @@ static const char* apzDarwin_Gcc4_BreakagePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Darwin_Macosx_Deployment_Target fix + */ +tSCC zDarwin_Macosx_Deployment_TargetName[] = + "darwin_macosx_deployment_target"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Macosx_Deployment_TargetList[] = + "|AvailabilityMacros.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Macosx_Deployment_TargetMachs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zDarwin_Macosx_Deployment_TargetBypass0[] = + "__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__"; + +#define DARWIN_MACOSX_DEPLOYMENT_TARGET_TEST_CT 1 +static tTestDesc aDarwin_Macosx_Deployment_TargetTests[] = { + { TT_NEGREP, zDarwin_Macosx_Deployment_TargetBypass0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Macosx_Deployment_Target + */ +static const char* apzDarwin_Macosx_Deployment_TargetPatch[] = { + "format", + "#if ! defined (MAC_OS_X_VERSION_MIN_REQUIRED) && defined (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)\n\ + #define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__\n\ +#elif ! defined (MAC_OS_X_VERSION_MIN_REQUIRED)\n", + "#ifndef MAC_OS_X_VERSION_MIN_REQUIRED\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Darwin_Private_Extern fix */ tSCC zDarwin_Private_ExternName[] = @@ -1758,6 +1842,132 @@ static const char* apzDarwin_Private_ExternPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Darwin_Stdint_Guards_Intn fix + */ +tSCC zDarwin_Stdint_Guards_IntnName[] = + "darwin_stdint_guards_intn"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Stdint_Guards_IntnList[] = + "|ppc/types.h|i386/types.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Stdint_Guards_IntnMachs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zDarwin_Stdint_Guards_IntnBypass0[] = + "_INT32_T[ \n\ +]"; + +#define DARWIN_STDINT_GUARDS_INTN_TEST_CT 1 +static tTestDesc aDarwin_Stdint_Guards_IntnTests[] = { + { TT_NEGREP, zDarwin_Stdint_Guards_IntnBypass0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Stdint_Guards_Intn + */ +static const char* apzDarwin_Stdint_Guards_IntnPatch[] = { + "format", + "#ifndef _INT%2_T\n\ +#define _INT%2_T\n\ +%0\n\ +#endif", + "typedef[ \t]([_a-z ]*\t+)int([0-9]+)_t;", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Darwin_Stdint_Guards_Intptr fix + */ +tSCC zDarwin_Stdint_Guards_IntptrName[] = + "darwin_stdint_guards_intptr"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Stdint_Guards_IntptrList[] = + "|ppc/types.h|i386/types.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Stdint_Guards_IntptrMachs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zDarwin_Stdint_Guards_IntptrBypass0[] = + "_INTPTR_T[ \n\ +]"; + +#define DARWIN_STDINT_GUARDS_INTPTR_TEST_CT 1 +static tTestDesc aDarwin_Stdint_Guards_IntptrTests[] = { + { TT_NEGREP, zDarwin_Stdint_Guards_IntptrBypass0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Stdint_Guards_Intptr + */ +static const char* apzDarwin_Stdint_Guards_IntptrPatch[] = { + "format", + "#ifndef _INTPTR_T\n\ +#define _INTPTR_T\n\ +%0\n\ +#endif", + "typedef[ \t]([_a-z \t]+)[ \t]+intptr_t;", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Darwin_Stdint_Guards_Uintptr fix + */ +tSCC zDarwin_Stdint_Guards_UintptrName[] = + "darwin_stdint_guards_uintptr"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Stdint_Guards_UintptrList[] = + "|ppc/types.h|i386/types.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Stdint_Guards_UintptrMachs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zDarwin_Stdint_Guards_UintptrBypass0[] = + "_UINTPTR_T[ \n\ +]"; + +#define DARWIN_STDINT_GUARDS_UINTPTR_TEST_CT 1 +static tTestDesc aDarwin_Stdint_Guards_UintptrTests[] = { + { TT_NEGREP, zDarwin_Stdint_Guards_UintptrBypass0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Stdint_Guards_Uintptr + */ +static const char* apzDarwin_Stdint_Guards_UintptrPatch[] = { + "format", + "#ifndef _UINTPTR_T\n\ +#define _UINTPTR_T\n\ +%0\n\ +#endif", + "typedef[ \t]([_a-z \t]+)[ \t]+uintptr_t;", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Dec_Intern_Asm fix */ tSCC zDec_Intern_AsmName[] = @@ -2648,6 +2858,46 @@ static const char* apzHpux_Ctype_MacrosPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hpux_Htonl fix + */ +tSCC zHpux_HtonlName[] = + "hpux_htonl"; + +/* + * File name selection pattern + */ +tSCC zHpux_HtonlList[] = + "|netinet/in.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzHpux_HtonlMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_HtonlSelect0[] = + "#ifndef _XOPEN_SOURCE_EXTENDED\n\ +(/\\*\n\ + \\* Macros for number representation conversion\\.\n\ + \\*/\n\ +#ifndef ntohl)"; + +#define HPUX_HTONL_TEST_CT 1 +static tTestDesc aHpux_HtonlTests[] = { + { TT_EGREP, zHpux_HtonlSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux_Htonl + */ +static const char* apzHpux_HtonlPatch[] = { + "format", + "#if 1\n\ +%1", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Hpux_Long_Double fix */ tSCC zHpux_Long_DoubleName[] = @@ -4143,6 +4393,42 @@ static const char* apzPthread_Page_SizePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Pthread_Incomplete_Struct_Argument fix + */ +tSCC zPthread_Incomplete_Struct_ArgumentName[] = + "pthread_incomplete_struct_argument"; + +/* + * File name selection pattern + */ +tSCC zPthread_Incomplete_Struct_ArgumentList[] = + "|pthread.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzPthread_Incomplete_Struct_ArgumentMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zPthread_Incomplete_Struct_ArgumentSelect0[] = + "struct __jmp_buf_tag"; + +#define PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT 1 +static tTestDesc aPthread_Incomplete_Struct_ArgumentTests[] = { + { TT_EGREP, zPthread_Incomplete_Struct_ArgumentSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Pthread_Incomplete_Struct_Argument + */ +static const char* apzPthread_Incomplete_Struct_ArgumentPatch[] = { + "format", + "%1 *%2%3", + "^(extern int __sigsetjmp \\(struct __jmp_buf_tag) (__env)\\[1\\](.*)$", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Read_Ret_Type fix */ tSCC zRead_Ret_TypeName[] = @@ -7085,14 +7371,15 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 207 +#define REGEX_COUNT 214 #define MACH_LIST_SIZE_LIMIT 261 -#define FIX_COUNT 177 +#define FIX_COUNT 184 /* * Enumerate the fixes */ typedef enum { + AAB_DARWIN_FENV_H_FIXIDX, AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX, AAB_FD_ZERO_GNU_TYPES_H_FIXIDX, AAB_FD_ZERO_SELECTBITS_H_FIXIDX, @@ -7133,7 +7420,11 @@ typedef enum { CTRL_QUOTES_USE_FIXIDX, CXX_UNREADY_FIXIDX, DARWIN_GCC4_BREAKAGE_FIXIDX, + DARWIN_MACOSX_DEPLOYMENT_TARGET_FIXIDX, DARWIN_PRIVATE_EXTERN_FIXIDX, + DARWIN_STDINT_GUARDS_INTN_FIXIDX, + DARWIN_STDINT_GUARDS_INTPTR_FIXIDX, + DARWIN_STDINT_GUARDS_UINTPTR_FIXIDX, DEC_INTERN_ASM_FIXIDX, DJGPP_WCHAR_H_FIXIDX, ECD_CURSOR_FIXIDX, @@ -7156,6 +7447,7 @@ typedef enum { HPUX11_VSNPRINTF_FIXIDX, HPUX8_BOGUS_INLINES_FIXIDX, HPUX_CTYPE_MACROS_FIXIDX, + HPUX_HTONL_FIXIDX, HPUX_LONG_DOUBLE_FIXIDX, HPUX_SYSTIME_FIXIDX, INT_ABORT_FREE_AND_EXIT_FIXIDX, @@ -7195,6 +7487,7 @@ typedef enum { OSF_NAMESPACE_A_FIXIDX, OSF_NAMESPACE_C_FIXIDX, PTHREAD_PAGE_SIZE_FIXIDX, + PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_FIXIDX, READ_RET_TYPE_FIXIDX, RPC_XDR_LVALUE_CAST_A_FIXIDX, RPC_XDR_LVALUE_CAST_B_FIXIDX, @@ -7273,6 +7566,11 @@ typedef enum { } t_fixinc_idx; tFixDesc fixDescList[ FIX_COUNT ] = { + { zAab_Darwin_Fenv_HName, zAab_Darwin_Fenv_HList, + apzAab_Darwin_Fenv_HMachs, + AAB_DARWIN_FENV_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, + aAab_Darwin_Fenv_HTests, apzAab_Darwin_Fenv_HPatch, 0 }, + { zAab_Fd_Zero_Asm_Posix_Types_HName, zAab_Fd_Zero_Asm_Posix_Types_HList, apzAab_Fd_Zero_Asm_Posix_Types_HMachs, AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, @@ -7473,11 +7771,31 @@ tFixDesc fixDescList[ FIX_COUNT ] = { DARWIN_GCC4_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aDarwin_Gcc4_BreakageTests, apzDarwin_Gcc4_BreakagePatch, 0 }, + { zDarwin_Macosx_Deployment_TargetName, zDarwin_Macosx_Deployment_TargetList, + apzDarwin_Macosx_Deployment_TargetMachs, + DARWIN_MACOSX_DEPLOYMENT_TARGET_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Macosx_Deployment_TargetTests, apzDarwin_Macosx_Deployment_TargetPatch, 0 }, + { zDarwin_Private_ExternName, zDarwin_Private_ExternList, apzDarwin_Private_ExternMachs, DARWIN_PRIVATE_EXTERN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aDarwin_Private_ExternTests, apzDarwin_Private_ExternPatch, 0 }, + { zDarwin_Stdint_Guards_IntnName, zDarwin_Stdint_Guards_IntnList, + apzDarwin_Stdint_Guards_IntnMachs, + DARWIN_STDINT_GUARDS_INTN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_Guards_IntnTests, apzDarwin_Stdint_Guards_IntnPatch, 0 }, + + { zDarwin_Stdint_Guards_IntptrName, zDarwin_Stdint_Guards_IntptrList, + apzDarwin_Stdint_Guards_IntptrMachs, + DARWIN_STDINT_GUARDS_INTPTR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_Guards_IntptrTests, apzDarwin_Stdint_Guards_IntptrPatch, 0 }, + + { zDarwin_Stdint_Guards_UintptrName, zDarwin_Stdint_Guards_UintptrList, + apzDarwin_Stdint_Guards_UintptrMachs, + DARWIN_STDINT_GUARDS_UINTPTR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_Guards_UintptrTests, apzDarwin_Stdint_Guards_UintptrPatch, 0 }, + { zDec_Intern_AsmName, zDec_Intern_AsmList, apzDec_Intern_AsmMachs, DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY, @@ -7588,6 +7906,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX_CTYPE_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux_Ctype_MacrosTests, apzHpux_Ctype_MacrosPatch, 0 }, + { zHpux_HtonlName, zHpux_HtonlList, + apzHpux_HtonlMachs, + HPUX_HTONL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_HtonlTests, apzHpux_HtonlPatch, 0 }, + { zHpux_Long_DoubleName, zHpux_Long_DoubleList, apzHpux_Long_DoubleMachs, HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY, @@ -7783,6 +8106,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { PTHREAD_PAGE_SIZE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aPthread_Page_SizeTests, apzPthread_Page_SizePatch, 0 }, + { zPthread_Incomplete_Struct_ArgumentName, zPthread_Incomplete_Struct_ArgumentList, + apzPthread_Incomplete_Struct_ArgumentMachs, + PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aPthread_Incomplete_Struct_ArgumentTests, apzPthread_Incomplete_Struct_ArgumentPatch, 0 }, + { zRead_Ret_TypeName, zRead_Ret_TypeList, apzRead_Ret_TypeMachs, READ_RET_TYPE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, |