From bde8e56451b01f705415187e4a14a24baf5adb8e Mon Sep 17 00:00:00 2001 From: Bruce Korb Date: Mon, 5 Jun 2000 17:49:58 +0000 Subject: [PATCH] New include hacks for ultrix From-SVN: r34409 --- gcc/fixinc/fixincl.x | 605 ++++++++++++++++++++++++++++++++----------- 1 file changed, 450 insertions(+), 155 deletions(-) diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index b2f98b42efd..5b89fbc74e7 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -5,7 +5,7 @@ * files which are fixed to work correctly with ANSI C and placed in a * directory that GNU C will search. * - * This file contains 123 fixup descriptions. + * This file contains 130 fixup descriptions. * * See README-fixinc for more information. * @@ -732,11 +732,113 @@ const char* apzAab_Ultrix_Ansi_CompatPatch[] = { "/* This file intentionally left blank. */\n", (char*)NULL }; +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aab_Ultrix_Limits fix + */ +#define AAB_ULTRIX_LIMITS_FIXIDX 13 +tSCC zAab_Ultrix_LimitsName[] = + "AAB_ultrix_limits"; + +/* + * File name selection pattern + */ +tSCC zAab_Ultrix_LimitsList[] = + "|limits.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAab_Ultrix_LimitsMachs[] = { + "*-*-ultrix4.3", + (const char*)NULL }; +#define AAB_ULTRIX_LIMITS_TEST_CT 0 +#define aAab_Ultrix_LimitsTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Aab_Ultrix_Limits + */ +const char* apzAab_Ultrix_LimitsPatch[] = { +"/*\t@(#)limits.h\t\t\t\t*/\n\ +/* This file was generated by fixincludes\t*/\n\ +#ifndef _LIMITS_INCLUDED\n\ +#define _LIMITS_INCLUDED\n\ +#include \n\ +#endif /* _LIMITS_INCLUDED */\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aab_Ultrix_Memory fix + */ +#define AAB_ULTRIX_MEMORY_FIXIDX 14 +tSCC zAab_Ultrix_MemoryName[] = + "AAB_ultrix_memory"; + +/* + * File name selection pattern + */ +tSCC zAab_Ultrix_MemoryList[] = + "|memory.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAab_Ultrix_MemoryMachs[] = { + "*-*-ultrix4.3", + (const char*)NULL }; +#define AAB_ULTRIX_MEMORY_TEST_CT 0 +#define aAab_Ultrix_MemoryTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Aab_Ultrix_Memory + */ +const char* apzAab_Ultrix_MemoryPatch[] = { +"/*\t@(#)memory.h\t\t\t\t*/\n\ +/* This file was generated by fixincludes\t*/\n\ +#ifndef _MEMORY_INCLUDED\n\ +#define _MEMORY_INCLUDED\n\ +#include \n\ +#endif /* _MEMORY_INCLUDED */\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aab_Ultrix_String fix + */ +#define AAB_ULTRIX_STRING_FIXIDX 15 +tSCC zAab_Ultrix_StringName[] = + "AAB_ultrix_string"; + +/* + * File name selection pattern + */ +tSCC zAab_Ultrix_StringList[] = + "|string.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAab_Ultrix_StringMachs[] = { + "*-*-ultrix4.3", + (const char*)NULL }; +#define AAB_ULTRIX_STRING_TEST_CT 0 +#define aAab_Ultrix_StringTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Aab_Ultrix_String + */ +const char* apzAab_Ultrix_StringPatch[] = { +"/*\t@(#)string.h\t\t\t\t*/\n\ +/* This file was generated by fixincludes\t*/\n\ +#ifndef _STRING_INCLUDED\n\ +#define _STRING_INCLUDED\n\ +#include \n\ +#endif /* _STRING_INCLUDED */\n", + (char*)NULL }; + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Aix_Syswait fix */ -#define AIX_SYSWAIT_FIXIDX 13 +#define AIX_SYSWAIT_FIXIDX 16 tSCC zAix_SyswaitName[] = "aix_syswait"; @@ -776,7 +878,7 @@ const char* apzAix_SyswaitPatch[] = { * * Description of Aix_Volatile fix */ -#define AIX_VOLATILE_FIXIDX 14 +#define AIX_VOLATILE_FIXIDX 17 tSCC zAix_VolatileName[] = "aix_volatile"; @@ -812,7 +914,7 @@ const char* apzAix_VolatilePatch[] = { * * Description of Alpha_Getopt fix */ -#define ALPHA_GETOPT_FIXIDX 15 +#define ALPHA_GETOPT_FIXIDX 18 tSCC zAlpha_GetoptName[] = "alpha_getopt"; @@ -848,7 +950,7 @@ const char* apzAlpha_GetoptPatch[] = { * * Description of Alpha_Parens fix */ -#define ALPHA_PARENS_FIXIDX 16 +#define ALPHA_PARENS_FIXIDX 19 tSCC zAlpha_ParensName[] = "alpha_parens"; @@ -884,7 +986,7 @@ const char* apzAlpha_ParensPatch[] = { * * Description of Alpha_Sbrk fix */ -#define ALPHA_SBRK_FIXIDX 17 +#define ALPHA_SBRK_FIXIDX 20 tSCC zAlpha_SbrkName[] = "alpha_sbrk"; @@ -920,7 +1022,7 @@ const char* apzAlpha_SbrkPatch[] = { * * Description of Arm_Norcroft_Hint fix */ -#define ARM_NORCROFT_HINT_FIXIDX 18 +#define ARM_NORCROFT_HINT_FIXIDX 21 tSCC zArm_Norcroft_HintName[] = "arm_norcroft_hint"; @@ -956,7 +1058,7 @@ const char* apzArm_Norcroft_HintPatch[] = { * * Description of Arm_Wchar fix */ -#define ARM_WCHAR_FIXIDX 19 +#define ARM_WCHAR_FIXIDX 22 tSCC zArm_WcharName[] = "arm_wchar"; @@ -993,7 +1095,7 @@ const char* apzArm_WcharPatch[] = { * * Description of Aux_Asm fix */ -#define AUX_ASM_FIXIDX 20 +#define AUX_ASM_FIXIDX 23 tSCC zAux_AsmName[] = "aux_asm"; @@ -1029,7 +1131,7 @@ const char* apzAux_AsmPatch[] = { * * Description of Avoid_Bool_Define fix */ -#define AVOID_BOOL_DEFINE_FIXIDX 21 +#define AVOID_BOOL_DEFINE_FIXIDX 24 tSCC zAvoid_Bool_DefineName[] = "avoid_bool_define"; @@ -1075,7 +1177,7 @@ const char* apzAvoid_Bool_DefinePatch[] = { * * Description of Avoid_Bool_Type fix */ -#define AVOID_BOOL_TYPE_FIXIDX 22 +#define AVOID_BOOL_TYPE_FIXIDX 25 tSCC zAvoid_Bool_TypeName[] = "avoid_bool_type"; @@ -1121,7 +1223,7 @@ const char* apzAvoid_Bool_TypePatch[] = { * * Description of Bad_Lval fix */ -#define BAD_LVAL_FIXIDX 23 +#define BAD_LVAL_FIXIDX 26 tSCC zBad_LvalName[] = "bad_lval"; @@ -1156,7 +1258,7 @@ const char* apzBad_LvalPatch[] = { "sed", * * Description of Bad_Struct_Term fix */ -#define BAD_STRUCT_TERM_FIXIDX 24 +#define BAD_STRUCT_TERM_FIXIDX 27 tSCC zBad_Struct_TermName[] = "bad_struct_term"; @@ -1192,7 +1294,7 @@ const char* apzBad_Struct_TermPatch[] = { * * Description of Badquote fix */ -#define BADQUOTE_FIXIDX 25 +#define BADQUOTE_FIXIDX 28 tSCC zBadquoteName[] = "badquote"; @@ -1228,7 +1330,7 @@ const char* apzBadquotePatch[] = { * * Description of Broken_Assert_Stdio fix */ -#define BROKEN_ASSERT_STDIO_FIXIDX 26 +#define BROKEN_ASSERT_STDIO_FIXIDX 29 tSCC zBroken_Assert_StdioName[] = "broken_assert_stdio"; @@ -1271,7 +1373,7 @@ const char* apzBroken_Assert_StdioPatch[] = { * * Description of Broken_Assert_Stdlib fix */ -#define BROKEN_ASSERT_STDLIB_FIXIDX 27 +#define BROKEN_ASSERT_STDLIB_FIXIDX 30 tSCC zBroken_Assert_StdlibName[] = "broken_assert_stdlib"; @@ -1316,7 +1418,7 @@ const char* apzBroken_Assert_StdlibPatch[] = { * * Description of Broken_Cabs fix */ -#define BROKEN_CABS_FIXIDX 28 +#define BROKEN_CABS_FIXIDX 31 tSCC zBroken_CabsName[] = "broken_cabs"; @@ -1353,7 +1455,7 @@ const char* apzBroken_CabsPatch[] = { * * Description of Ctrl_Quotes_Def fix */ -#define CTRL_QUOTES_DEF_FIXIDX 29 +#define CTRL_QUOTES_DEF_FIXIDX 32 tSCC zCtrl_Quotes_DefName[] = "ctrl_quotes_def"; @@ -1388,7 +1490,7 @@ const char* apzCtrl_Quotes_DefPatch[] = { * * Description of Ctrl_Quotes_Use fix */ -#define CTRL_QUOTES_USE_FIXIDX 30 +#define CTRL_QUOTES_USE_FIXIDX 33 tSCC zCtrl_Quotes_UseName[] = "ctrl_quotes_use"; @@ -1423,7 +1525,7 @@ const char* apzCtrl_Quotes_UsePatch[] = { * * Description of Cxx_Unready fix */ -#define CXX_UNREADY_FIXIDX 31 +#define CXX_UNREADY_FIXIDX 34 tSCC zCxx_UnreadyName[] = "cxx_unready"; @@ -1471,7 +1573,7 @@ extern \"C\" {\n\ * * Description of Dec_Intern_Asm fix */ -#define DEC_INTERN_ASM_FIXIDX 32 +#define DEC_INTERN_ASM_FIXIDX 35 tSCC zDec_Intern_AsmName[] = "dec_intern_asm"; @@ -1501,7 +1603,7 @@ const char* apzDec_Intern_AsmPatch[] = { "sed", * * Description of Ecd_Cursor fix */ -#define ECD_CURSOR_FIXIDX 33 +#define ECD_CURSOR_FIXIDX 36 tSCC zEcd_CursorName[] = "ecd_cursor"; @@ -1537,7 +1639,7 @@ const char* apzEcd_CursorPatch[] = { * * Description of Fix_Header_Breakage fix */ -#define FIX_HEADER_BREAKAGE_FIXIDX 34 +#define FIX_HEADER_BREAKAGE_FIXIDX 37 tSCC zFix_Header_BreakageName[] = "fix_header_breakage"; @@ -1575,7 +1677,7 @@ const char* apzFix_Header_BreakagePatch[] = { * * Description of Hp_Inline fix */ -#define HP_INLINE_FIXIDX 35 +#define HP_INLINE_FIXIDX 38 tSCC zHp_InlineName[] = "hp_inline"; @@ -1612,7 +1714,7 @@ const char* apzHp_InlinePatch[] = { * * Description of Hp_Sysfile fix */ -#define HP_SYSFILE_FIXIDX 36 +#define HP_SYSFILE_FIXIDX 39 tSCC zHp_SysfileName[] = "hp_sysfile"; @@ -1649,7 +1751,7 @@ const char* apzHp_SysfilePatch[] = { * * Description of Hpux11_Fabsf fix */ -#define HPUX11_FABSF_FIXIDX 37 +#define HPUX11_FABSF_FIXIDX 40 tSCC zHpux11_FabsfName[] = "hpux11_fabsf"; @@ -1694,7 +1796,7 @@ const char* apzHpux11_FabsfPatch[] = { * * Description of Hpux11_Uint32_C fix */ -#define HPUX11_UINT32_C_FIXIDX 38 +#define HPUX11_UINT32_C_FIXIDX 41 tSCC zHpux11_Uint32_CName[] = "hpux11_uint32_c"; @@ -1730,7 +1832,7 @@ const char* apzHpux11_Uint32_CPatch[] = { * * Description of Hpux8_Bogus_Inlines fix */ -#define HPUX8_BOGUS_INLINES_FIXIDX 39 +#define HPUX8_BOGUS_INLINES_FIXIDX 42 tSCC zHpux8_Bogus_InlinesName[] = "hpux8_bogus_inlines"; @@ -1768,7 +1870,7 @@ const char* apzHpux8_Bogus_InlinesPatch[] = { "sed", * * Description of Int_Abort_Free_And_Exit fix */ -#define INT_ABORT_FREE_AND_EXIT_FIXIDX 40 +#define INT_ABORT_FREE_AND_EXIT_FIXIDX 43 tSCC zInt_Abort_Free_And_ExitName[] = "int_abort_free_and_exit"; @@ -1804,7 +1906,7 @@ const char* apzInt_Abort_Free_And_ExitPatch[] = { * * Description of Isc_Omits_With_Stdc fix */ -#define ISC_OMITS_WITH_STDC_FIXIDX 41 +#define ISC_OMITS_WITH_STDC_FIXIDX 44 tSCC zIsc_Omits_With_StdcName[] = "isc_omits_with_stdc"; @@ -1840,7 +1942,7 @@ const char* apzIsc_Omits_With_StdcPatch[] = { * * Description of Io_Quotes_Def fix */ -#define IO_QUOTES_DEF_FIXIDX 42 +#define IO_QUOTES_DEF_FIXIDX 45 tSCC zIo_Quotes_DefName[] = "io_quotes_def"; @@ -1875,7 +1977,7 @@ const char* apzIo_Quotes_DefPatch[] = { * * Description of Io_Quotes_Use fix */ -#define IO_QUOTES_USE_FIXIDX 43 +#define IO_QUOTES_USE_FIXIDX 46 tSCC zIo_Quotes_UseName[] = "io_quotes_use"; @@ -1910,7 +2012,7 @@ const char* apzIo_Quotes_UsePatch[] = { * * Description of Hpux_Maxint fix */ -#define HPUX_MAXINT_FIXIDX 44 +#define HPUX_MAXINT_FIXIDX 47 tSCC zHpux_MaxintName[] = "hpux_maxint"; @@ -1949,7 +2051,7 @@ const char* apzHpux_MaxintPatch[] = { * * Description of Hpux_Systime fix */ -#define HPUX_SYSTIME_FIXIDX 45 +#define HPUX_SYSTIME_FIXIDX 48 tSCC zHpux_SystimeName[] = "hpux_systime"; @@ -1985,7 +2087,7 @@ const char* apzHpux_SystimePatch[] = { * * Description of Ip_Missing_Semi fix */ -#define IP_MISSING_SEMI_FIXIDX 46 +#define IP_MISSING_SEMI_FIXIDX 49 tSCC zIp_Missing_SemiName[] = "ip_missing_semi"; @@ -2020,7 +2122,7 @@ const char* apzIp_Missing_SemiPatch[] = { "sed", * * Description of Irix_Asm_Apostrophe fix */ -#define IRIX_ASM_APOSTROPHE_FIXIDX 47 +#define IRIX_ASM_APOSTROPHE_FIXIDX 50 tSCC zIrix_Asm_ApostropheName[] = "irix_asm_apostrophe"; @@ -2057,7 +2159,7 @@ const char* apzIrix_Asm_ApostrophePatch[] = { * * Description of Irix_Multiline_Cmnt fix */ -#define IRIX_MULTILINE_CMNT_FIXIDX 48 +#define IRIX_MULTILINE_CMNT_FIXIDX 51 tSCC zIrix_Multiline_CmntName[] = "irix_multiline_cmnt"; @@ -2085,7 +2187,7 @@ const char* apzIrix_Multiline_CmntPatch[] = { "sed", * * Description of Isc_Fmod fix */ -#define ISC_FMOD_FIXIDX 49 +#define ISC_FMOD_FIXIDX 52 tSCC zIsc_FmodName[] = "isc_fmod"; @@ -2121,7 +2223,7 @@ const char* apzIsc_FmodPatch[] = { * * Description of Kandr_Concat fix */ -#define KANDR_CONCAT_FIXIDX 50 +#define KANDR_CONCAT_FIXIDX 53 tSCC zKandr_ConcatName[] = "kandr_concat"; @@ -2157,7 +2259,7 @@ const char* apzKandr_ConcatPatch[] = { * * Description of Limits_Ifndefs fix */ -#define LIMITS_IFNDEFS_FIXIDX 51 +#define LIMITS_IFNDEFS_FIXIDX 54 tSCC zLimits_IfndefsName[] = "limits_ifndefs"; @@ -2196,7 +2298,7 @@ const char* apzLimits_IfndefsPatch[] = { * * Description of Lynx_Void_Int fix */ -#define LYNX_VOID_INT_FIXIDX 52 +#define LYNX_VOID_INT_FIXIDX 55 tSCC zLynx_Void_IntName[] = "lynx_void_int"; @@ -2232,7 +2334,7 @@ const char* apzLynx_Void_IntPatch[] = { * * Description of Lynxos_Fcntl_Proto fix */ -#define LYNXOS_FCNTL_PROTO_FIXIDX 53 +#define LYNXOS_FCNTL_PROTO_FIXIDX 56 tSCC zLynxos_Fcntl_ProtoName[] = "lynxos_fcntl_proto"; @@ -2269,7 +2371,7 @@ const char* apzLynxos_Fcntl_ProtoPatch[] = { * * Description of M88k_Bad_Hypot_Opt fix */ -#define M88K_BAD_HYPOT_OPT_FIXIDX 54 +#define M88K_BAD_HYPOT_OPT_FIXIDX 57 tSCC zM88k_Bad_Hypot_OptName[] = "m88k_bad_hypot_opt"; @@ -2318,7 +2420,7 @@ static __inline__ double fake_hypot (x, y)\n\ * * Description of M88k_Bad_S_If fix */ -#define M88K_BAD_S_IF_FIXIDX 55 +#define M88K_BAD_S_IF_FIXIDX 58 tSCC zM88k_Bad_S_IfName[] = "m88k_bad_s_if"; @@ -2357,7 +2459,7 @@ const char* apzM88k_Bad_S_IfPatch[] = { * * Description of M88k_Multi_Incl fix */ -#define M88K_MULTI_INCL_FIXIDX 56 +#define M88K_MULTI_INCL_FIXIDX 59 tSCC zM88k_Multi_InclName[] = "m88k_multi_incl"; @@ -2394,7 +2496,7 @@ const char* apzM88k_Multi_InclPatch[] = { * * Description of Machine_Ansi_H_Va_List fix */ -#define MACHINE_ANSI_H_VA_LIST_FIXIDX 57 +#define MACHINE_ANSI_H_VA_LIST_FIXIDX 60 tSCC zMachine_Ansi_H_Va_ListName[] = "machine_ansi_h_va_list"; @@ -2438,7 +2540,7 @@ const char* apzMachine_Ansi_H_Va_ListPatch[] = { * * Description of Machine_Name fix */ -#define MACHINE_NAME_FIXIDX 58 +#define MACHINE_NAME_FIXIDX 61 tSCC zMachine_NameName[] = "machine_name"; @@ -2471,7 +2573,7 @@ const char* apzMachine_NamePatch[] = { * * Description of Math_Exception fix */ -#define MATH_EXCEPTION_FIXIDX 59 +#define MATH_EXCEPTION_FIXIDX 62 tSCC zMath_ExceptionName[] = "math_exception"; @@ -2519,7 +2621,7 @@ const char* apzMath_ExceptionPatch[] = { * * Description of Math_Huge_Val_From_Dbl_Max fix */ -#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 60 +#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 63 tSCC zMath_Huge_Val_From_Dbl_MaxName[] = "math_huge_val_from_dbl_max"; @@ -2566,7 +2668,7 @@ const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c", * * Description of Math_Huge_Val_Ifndef fix */ -#define MATH_HUGE_VAL_IFNDEF_FIXIDX 61 +#define MATH_HUGE_VAL_IFNDEF_FIXIDX 64 tSCC zMath_Huge_Val_IfndefName[] = "math_huge_val_ifndef"; @@ -2605,7 +2707,7 @@ const char* apzMath_Huge_Val_IfndefPatch[] = { * * Description of Nested_Motorola fix */ -#define NESTED_MOTOROLA_FIXIDX 62 +#define NESTED_MOTOROLA_FIXIDX 65 tSCC zNested_MotorolaName[] = "nested_motorola"; @@ -2635,7 +2737,7 @@ const char* apzNested_MotorolaPatch[] = { "sed", * * Description of Nested_Sys_Limits fix */ -#define NESTED_SYS_LIMITS_FIXIDX 63 +#define NESTED_SYS_LIMITS_FIXIDX 66 tSCC zNested_Sys_LimitsName[] = "nested_sys_limits"; @@ -2671,7 +2773,7 @@ const char* apzNested_Sys_LimitsPatch[] = { "sed", * * Description of Nested_Auth_Des fix */ -#define NESTED_AUTH_DES_FIXIDX 64 +#define NESTED_AUTH_DES_FIXIDX 67 tSCC zNested_Auth_DesName[] = "nested_auth_des"; @@ -2703,38 +2805,11 @@ const char* apzNested_Auth_DesPatch[] = { "%1*/ /*", (char*)NULL }; -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Nested_Ultrix fix - */ -#define NESTED_ULTRIX_FIXIDX 65 -tSCC zNested_UltrixName[] = - "nested_ultrix"; - -/* - * File name selection pattern - */ -tSCC zNested_UltrixList[] = - "|rpc/svc.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzNested_UltrixMachs (const char**)NULL -#define NESTED_ULTRIX_TEST_CT 0 -#define aNested_UltrixTests (tTestDesc*)NULL - -/* - * Fix Command Arguments for Nested_Ultrix - */ -const char* apzNested_UltrixPatch[] = { "sed", - "-e", "s@^\\( \\*\tint protocol; \\)/\\*@\\1*/ /*@", - (char*)NULL }; - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of News_Os_Recursion fix */ -#define NEWS_OS_RECURSION_FIXIDX 66 +#define NEWS_OS_RECURSION_FIXIDX 68 tSCC zNews_Os_RecursionName[] = "news_os_recursion"; @@ -2772,7 +2847,7 @@ const char* apzNews_Os_RecursionPatch[] = { * * Description of Next_Math_Prefix fix */ -#define NEXT_MATH_PREFIX_FIXIDX 67 +#define NEXT_MATH_PREFIX_FIXIDX 69 tSCC zNext_Math_PrefixName[] = "next_math_prefix"; @@ -2809,7 +2884,7 @@ const char* apzNext_Math_PrefixPatch[] = { * * Description of Next_Template fix */ -#define NEXT_TEMPLATE_FIXIDX 68 +#define NEXT_TEMPLATE_FIXIDX 70 tSCC zNext_TemplateName[] = "next_template"; @@ -2846,7 +2921,7 @@ const char* apzNext_TemplatePatch[] = { * * Description of Next_Volitile fix */ -#define NEXT_VOLITILE_FIXIDX 69 +#define NEXT_VOLITILE_FIXIDX 71 tSCC zNext_VolitileName[] = "next_volitile"; @@ -2883,7 +2958,7 @@ const char* apzNext_VolitilePatch[] = { * * Description of Next_Wait_Union fix */ -#define NEXT_WAIT_UNION_FIXIDX 70 +#define NEXT_WAIT_UNION_FIXIDX 72 tSCC zNext_Wait_UnionName[] = "next_wait_union"; @@ -2919,7 +2994,7 @@ const char* apzNext_Wait_UnionPatch[] = { * * Description of Nodeent_Syntax fix */ -#define NODEENT_SYNTAX_FIXIDX 71 +#define NODEENT_SYNTAX_FIXIDX 73 tSCC zNodeent_SyntaxName[] = "nodeent_syntax"; @@ -2955,7 +3030,7 @@ const char* apzNodeent_SyntaxPatch[] = { * * Description of Osf_Namespace_A fix */ -#define OSF_NAMESPACE_A_FIXIDX 72 +#define OSF_NAMESPACE_A_FIXIDX 74 tSCC zOsf_Namespace_AName[] = "osf_namespace_a"; @@ -3001,7 +3076,7 @@ const char* apzOsf_Namespace_APatch[] = { * * Description of Osf_Namespace_C fix */ -#define OSF_NAMESPACE_C_FIXIDX 73 +#define OSF_NAMESPACE_C_FIXIDX 75 tSCC zOsf_Namespace_CName[] = "osf_namespace_c"; @@ -3056,7 +3131,7 @@ typedef __regmatch_t\tregmatch_t;", * * Description of Pthread_Page_Size fix */ -#define PTHREAD_PAGE_SIZE_FIXIDX 74 +#define PTHREAD_PAGE_SIZE_FIXIDX 76 tSCC zPthread_Page_SizeName[] = "pthread_page_size"; @@ -3092,7 +3167,7 @@ const char* apzPthread_Page_SizePatch[] = { * * Description of Read_Ret_Type fix */ -#define READ_RET_TYPE_FIXIDX 75 +#define READ_RET_TYPE_FIXIDX 77 tSCC zRead_Ret_TypeName[] = "read_ret_type"; @@ -3130,7 +3205,7 @@ const char* apzRead_Ret_TypePatch[] = { * * Description of Rs6000_Double fix */ -#define RS6000_DOUBLE_FIXIDX 76 +#define RS6000_DOUBLE_FIXIDX 78 tSCC zRs6000_DoubleName[] = "rs6000_double"; @@ -3169,7 +3244,7 @@ const char* apzRs6000_DoublePatch[] = { * * Description of Rs6000_Fchmod fix */ -#define RS6000_FCHMOD_FIXIDX 77 +#define RS6000_FCHMOD_FIXIDX 79 tSCC zRs6000_FchmodName[] = "rs6000_fchmod"; @@ -3205,7 +3280,7 @@ const char* apzRs6000_FchmodPatch[] = { * * Description of Rs6000_Param fix */ -#define RS6000_PARAM_FIXIDX 78 +#define RS6000_PARAM_FIXIDX 80 tSCC zRs6000_ParamName[] = "rs6000_param"; @@ -3241,7 +3316,7 @@ const char* apzRs6000_ParamPatch[] = { * * Description of Sco_Static_Func fix */ -#define SCO_STATIC_FUNC_FIXIDX 79 +#define SCO_STATIC_FUNC_FIXIDX 81 tSCC zSco_Static_FuncName[] = "sco_static_func"; @@ -3285,7 +3360,7 @@ extern \"C\" {\\\n\ * * Description of Sco_Strict_Ansi fix */ -#define SCO_STRICT_ANSI_FIXIDX 80 +#define SCO_STRICT_ANSI_FIXIDX 82 tSCC zSco_Strict_AnsiName[] = "sco_strict_ansi"; @@ -3323,7 +3398,7 @@ const char* apzSco_Strict_AnsiPatch[] = { * * Description of Sco_Utime fix */ -#define SCO_UTIME_FIXIDX 81 +#define SCO_UTIME_FIXIDX 83 tSCC zSco_UtimeName[] = "sco_utime"; @@ -3361,7 +3436,7 @@ const char* apzSco_UtimePatch[] = { * * Description of Sony_Include fix */ -#define SONY_INCLUDE_FIXIDX 82 +#define SONY_INCLUDE_FIXIDX 84 tSCC zSony_IncludeName[] = "sony_include"; @@ -3396,7 +3471,7 @@ const char* apzSony_IncludePatch[] = { "sed", * * Description of Statsswtch fix */ -#define STATSSWTCH_FIXIDX 83 +#define STATSSWTCH_FIXIDX 85 tSCC zStatsswtchName[] = "statsswtch"; @@ -3432,7 +3507,7 @@ const char* apzStatsswtchPatch[] = { * * Description of Stdio_Stdarg_H fix */ -#define STDIO_STDARG_H_FIXIDX 84 +#define STDIO_STDARG_H_FIXIDX 86 tSCC zStdio_Stdarg_HName[] = "stdio_stdarg_h"; @@ -3469,7 +3544,7 @@ const char* apzStdio_Stdarg_HPatch[] = { * * Description of Stdio_Va_List fix */ -#define STDIO_VA_LIST_FIXIDX 85 +#define STDIO_VA_LIST_FIXIDX 87 tSCC zStdio_Va_ListName[] = "stdio_va_list"; @@ -3514,7 +3589,7 @@ s@_Va_LIST@_VA_LIST@", * * Description of Struct_File fix */ -#define STRUCT_FILE_FIXIDX 86 +#define STRUCT_FILE_FIXIDX 88 tSCC zStruct_FileName[] = "struct_file"; @@ -3551,7 +3626,7 @@ const char* apzStruct_FilePatch[] = { * * Description of Struct_Sockaddr fix */ -#define STRUCT_SOCKADDR_FIXIDX 87 +#define STRUCT_SOCKADDR_FIXIDX 89 tSCC zStruct_SockaddrName[] = "struct_sockaddr"; @@ -3595,7 +3670,7 @@ const char* apzStruct_SockaddrPatch[] = { * * Description of Sun_Auth_Proto fix */ -#define SUN_AUTH_PROTO_FIXIDX 88 +#define SUN_AUTH_PROTO_FIXIDX 90 tSCC zSun_Auth_ProtoName[] = "sun_auth_proto"; @@ -3636,7 +3711,7 @@ const char* apzSun_Auth_ProtoPatch[] = { * * Description of Sun_Bogus_Ifdef fix */ -#define SUN_BOGUS_IFDEF_FIXIDX 89 +#define SUN_BOGUS_IFDEF_FIXIDX 91 tSCC zSun_Bogus_IfdefName[] = "sun_bogus_ifdef"; @@ -3672,7 +3747,7 @@ const char* apzSun_Bogus_IfdefPatch[] = { * * Description of Sun_Catmacro fix */ -#define SUN_CATMACRO_FIXIDX 90 +#define SUN_CATMACRO_FIXIDX 92 tSCC zSun_CatmacroName[] = "sun_catmacro"; @@ -3712,7 +3787,7 @@ const char* apzSun_CatmacroPatch[] = { * * Description of Sun_Malloc fix */ -#define SUN_MALLOC_FIXIDX 91 +#define SUN_MALLOC_FIXIDX 93 tSCC zSun_MallocName[] = "sun_malloc"; @@ -3743,7 +3818,7 @@ const char* apzSun_MallocPatch[] = { "sed", * * Description of Sun_Rusers_Semi fix */ -#define SUN_RUSERS_SEMI_FIXIDX 92 +#define SUN_RUSERS_SEMI_FIXIDX 94 tSCC zSun_Rusers_SemiName[] = "sun_rusers_semi"; @@ -3778,7 +3853,7 @@ const char* apzSun_Rusers_SemiPatch[] = { "sed", * * Description of Sun_Signal fix */ -#define SUN_SIGNAL_FIXIDX 93 +#define SUN_SIGNAL_FIXIDX 95 tSCC zSun_SignalName[] = "sun_signal"; @@ -3818,7 +3893,7 @@ void\t(*signal(...))(...);\n\ * * Description of Sunos_Matherr_Decl fix */ -#define SUNOS_MATHERR_DECL_FIXIDX 94 +#define SUNOS_MATHERR_DECL_FIXIDX 96 tSCC zSunos_Matherr_DeclName[] = "sunos_matherr_decl"; @@ -3861,7 +3936,7 @@ const char* apzSunos_Matherr_DeclPatch[] = { * * Description of Sunos_Strlen fix */ -#define SUNOS_STRLEN_FIXIDX 95 +#define SUNOS_STRLEN_FIXIDX 97 tSCC zSunos_StrlenName[] = "sunos_strlen"; @@ -3897,7 +3972,7 @@ const char* apzSunos_StrlenPatch[] = { * * Description of Svr4__P fix */ -#define SVR4__P_FIXIDX 96 +#define SVR4__P_FIXIDX 98 tSCC zSvr4__PName[] = "svr4__p"; @@ -3935,7 +4010,7 @@ const char* apzSvr4__PPatch[] = { * * Description of Svr4_Getcwd fix */ -#define SVR4_GETCWD_FIXIDX 97 +#define SVR4_GETCWD_FIXIDX 99 tSCC zSvr4_GetcwdName[] = "svr4_getcwd"; @@ -3971,7 +4046,7 @@ const char* apzSvr4_GetcwdPatch[] = { * * Description of Svr4_Profil fix */ -#define SVR4_PROFIL_FIXIDX 98 +#define SVR4_PROFIL_FIXIDX 100 tSCC zSvr4_ProfilName[] = "svr4_profil"; @@ -4007,7 +4082,7 @@ const char* apzSvr4_ProfilPatch[] = { * * Description of Systypes fix */ -#define SYSTYPES_FIXIDX 99 +#define SYSTYPES_FIXIDX 101 tSCC zSystypesName[] = "systypes"; @@ -4066,7 +4141,7 @@ typedef __SIZE_TYPE__ size_t;\\\n\ * * Description of Systypes_Stdlib_Size_T fix */ -#define SYSTYPES_STDLIB_SIZE_T_FIXIDX 100 +#define SYSTYPES_STDLIB_SIZE_T_FIXIDX 102 tSCC zSystypes_Stdlib_Size_TName[] = "systypes_stdlib_size_t"; @@ -4112,7 +4187,7 @@ const char* apzSystypes_Stdlib_Size_TPatch[] = { * * Description of Sysv68_String fix */ -#define SYSV68_STRING_FIXIDX 101 +#define SYSV68_STRING_FIXIDX 103 tSCC zSysv68_StringName[] = "sysv68_string"; @@ -4149,7 +4224,7 @@ extern unsigned int\\\n\ * * Description of Sysz_Stdlib_For_Sun fix */ -#define SYSZ_STDLIB_FOR_SUN_FIXIDX 102 +#define SYSZ_STDLIB_FOR_SUN_FIXIDX 104 tSCC zSysz_Stdlib_For_SunName[] = "sysz_stdlib_for_sun"; @@ -4185,7 +4260,7 @@ const char* apzSysz_Stdlib_For_SunPatch[] = { * * Description of Sysz_Stdtypes_For_Sun fix */ -#define SYSZ_STDTYPES_FOR_SUN_FIXIDX 103 +#define SYSZ_STDTYPES_FOR_SUN_FIXIDX 105 tSCC zSysz_Stdtypes_For_SunName[] = "sysz_stdtypes_for_sun"; @@ -4226,7 +4301,7 @@ const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed", * * Description of Tinfo_Cplusplus fix */ -#define TINFO_CPLUSPLUS_FIXIDX 104 +#define TINFO_CPLUSPLUS_FIXIDX 106 tSCC zTinfo_CplusplusName[] = "tinfo_cplusplus"; @@ -4262,7 +4337,7 @@ const char* apzTinfo_CplusplusPatch[] = { * * Description of Ultrix_Atof_Param fix */ -#define ULTRIX_ATOF_PARAM_FIXIDX 105 +#define ULTRIX_ATOF_PARAM_FIXIDX 107 tSCC zUltrix_Atof_ParamName[] = "ultrix_atof_param"; @@ -4289,15 +4364,16 @@ tTestDesc aUltrix_Atof_ParamTests[] = { /* * Fix Command Arguments for Ultrix_Atof_Param */ -const char* apzUltrix_Atof_ParamPatch[] = { "sed", - "-e", "s@atof(\\([ \t]*char[ \t]*\\*[^)]*\\))@atof(const \\1)@", +const char* apzUltrix_Atof_ParamPatch[] = { + "format", + "atof(const char", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Ultrix_Const fix */ -#define ULTRIX_CONST_FIXIDX 106 +#define ULTRIX_CONST_FIXIDX 108 tSCC zUltrix_ConstName[] = "ultrix_const"; @@ -4334,7 +4410,7 @@ const char* apzUltrix_ConstPatch[] = { * * Description of Ultrix_Const2 fix */ -#define ULTRIX_CONST2_FIXIDX 107 +#define ULTRIX_CONST2_FIXIDX 109 tSCC zUltrix_Const2Name[] = "ultrix_const2"; @@ -4371,7 +4447,7 @@ const char* apzUltrix_Const2Patch[] = { * * Description of Ultrix_Fix_Fixproto fix */ -#define ULTRIX_FIX_FIXPROTO_FIXIDX 108 +#define ULTRIX_FIX_FIXPROTO_FIXIDX 110 tSCC zUltrix_Fix_FixprotoName[] = "ultrix_fix_fixproto"; @@ -4398,16 +4474,18 @@ tTestDesc aUltrix_Fix_FixprotoTests[] = { /* * Fix Command Arguments for Ultrix_Fix_Fixproto */ -const char* apzUltrix_Fix_FixprotoPatch[] = { "sed", - "-e", "/^[ \t]*extern[ \t]*int[ \t]*uname();$/i\\\n\ -struct utsname;\n", +const char* apzUltrix_Fix_FixprotoPatch[] = { + "format", + "struct utsname;\n\ +%0", + "^[ \t]*extern[ \t]*int[ \t]*uname\\(\\);", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Ultrix_Ifdef fix */ -#define ULTRIX_IFDEF_FIXIDX 109 +#define ULTRIX_IFDEF_FIXIDX 111 tSCC zUltrix_IfdefName[] = "ultrix_ifdef"; @@ -4425,7 +4503,7 @@ tSCC zUltrix_IfdefList[] = * content selection pattern - do fix if pattern found */ tSCC zUltrix_IfdefSelect0[] = - "#ifdef KERNEL[ \t]+[^ \t]"; + "^#ifdef KERNEL[ \t]+&&"; #define ULTRIX_IFDEF_TEST_CT 1 tTestDesc aUltrix_IfdefTests[] = { @@ -4434,15 +4512,162 @@ tTestDesc aUltrix_IfdefTests[] = { /* * Fix Command Arguments for Ultrix_Ifdef */ -const char* apzUltrix_IfdefPatch[] = { "sed", - "-e", "s/#ifdef KERNEL/#if defined(KERNEL)/", +const char* apzUltrix_IfdefPatch[] = { + "format", + "#if defined(KERNEL) &&", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Ultrix_Math_Ifdef fix + */ +#define ULTRIX_MATH_IFDEF_FIXIDX 112 +tSCC zUltrix_Math_IfdefName[] = + "ultrix_math_ifdef"; + +/* + * File name selection pattern + */ +tSCC zUltrix_Math_IfdefList[] = + "|float.h|math.h|sys/limits.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzUltrix_Math_IfdefMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zUltrix_Math_IfdefSelect0[] = + "^#if.*\\|\\|[ \t]+CC\\$[a-z]+"; + +#define ULTRIX_MATH_IFDEF_TEST_CT 1 +tTestDesc aUltrix_Math_IfdefTests[] = { + { TT_EGREP, zUltrix_Math_IfdefSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Ultrix_Math_Ifdef + */ +const char* apzUltrix_Math_IfdefPatch[] = { "sed", + "-e", "/^#if/s/||[ \t][ \t]*CC$[a-z][a-z]*//", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Ultrix_Nested_Ioctl fix + */ +#define ULTRIX_NESTED_IOCTL_FIXIDX 113 +tSCC zUltrix_Nested_IoctlName[] = + "ultrix_nested_ioctl"; + +/* + * File name selection pattern + */ +tSCC zUltrix_Nested_IoctlList[] = + "|sys/ioctl.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzUltrix_Nested_IoctlMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zUltrix_Nested_IoctlSelect0[] = + "^/\\* #define SIOCSCREEN"; + +#define ULTRIX_NESTED_IOCTL_TEST_CT 1 +tTestDesc aUltrix_Nested_IoctlTests[] = { + { TT_EGREP, zUltrix_Nested_IoctlSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Ultrix_Nested_Ioctl + */ +const char* apzUltrix_Nested_IoctlPatch[] = { "sed", + "-e", "/^\\/\\* #define SIOCSCREEN/s@/\\* screend@*//* screend@", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Ultrix_Nested_Svc fix + */ +#define ULTRIX_NESTED_SVC_FIXIDX 114 +tSCC zUltrix_Nested_SvcName[] = + "ultrix_nested_svc"; + +/* + * File name selection pattern + */ +tSCC zUltrix_Nested_SvcList[] = + "|rpc/svc.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzUltrix_Nested_SvcMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zUltrix_Nested_SvcSelect0[] = + "^ \\*[ \t]*int protocol; */\\*"; + +#define ULTRIX_NESTED_SVC_TEST_CT 1 +tTestDesc aUltrix_Nested_SvcTests[] = { + { TT_EGREP, zUltrix_Nested_SvcSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Ultrix_Nested_Svc + */ +const char* apzUltrix_Nested_SvcPatch[] = { "sed", + "-e", "s@^\\( \\*\tint protocol; \\)/\\*@\\1*/ /*@", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Ultrix_Stat fix + */ +#define ULTRIX_STAT_FIXIDX 115 +tSCC zUltrix_StatName[] = + "ultrix_stat"; + +/* + * File name selection pattern + */ +tSCC zUltrix_StatList[] = + "|sys/stat.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzUltrix_StatMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zUltrix_StatSelect0[] = + "@\\(#\\)stat\\.h.*6\\.1.*\\(ULTRIX\\)"; + +#define ULTRIX_STAT_TEST_CT 1 +tTestDesc aUltrix_StatTests[] = { + { TT_EGREP, zUltrix_StatSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Ultrix_Stat + */ +const char* apzUltrix_StatPatch[] = { "sed", + "-e", "/^#define[ \t]S_IFPORT[ \t]*S_IFIFO$/a\\\n\ +\\\n\ +/* macro to test for symbolic link */\\\n\ +#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)\\\n\ +\n", + "-e", "/^[ \t]*fstat(),$/a\\\n\ +\tlstat(),\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Ultrix_Static fix */ -#define ULTRIX_STATIC_FIXIDX 110 +#define ULTRIX_STATIC_FIXIDX 116 tSCC zUltrix_StaticName[] = "ultrix_static"; @@ -4475,11 +4700,46 @@ const char* apzUltrix_StaticPatch[] = { "sed", "-e", "s/^#include \"r4_cpu\\.h\"$/#include /", (char*)NULL }; +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Ultrix_Strings fix + */ +#define ULTRIX_STRINGS_FIXIDX 117 +tSCC zUltrix_StringsName[] = + "ultrix_strings"; + +/* + * File name selection pattern + */ +tSCC zUltrix_StringsList[] = + "|strings.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzUltrix_StringsMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zUltrix_StringsSelect0[] = + "@\\(#\\)strings\\.h.*6\\.1.*\\(ULTRIX\\)"; + +#define ULTRIX_STRINGS_TEST_CT 1 +tTestDesc aUltrix_StringsTests[] = { + { TT_EGREP, zUltrix_StringsSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Ultrix_Strings + */ +const char* apzUltrix_StringsPatch[] = { + "wrap", + (char*)NULL }; + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * Description of Undefine_Null fix */ -#define UNDEFINE_NULL_FIXIDX 111 +#define UNDEFINE_NULL_FIXIDX 118 tSCC zUndefine_NullName[] = "undefine_null"; @@ -4525,7 +4785,7 @@ const char* apzUndefine_NullPatch[] = { * * Description of Unixware7_Byteorder_Fix fix */ -#define UNIXWARE7_BYTEORDER_FIX_FIXIDX 112 +#define UNIXWARE7_BYTEORDER_FIX_FIXIDX 119 tSCC zUnixware7_Byteorder_FixName[] = "unixware7_byteorder_fix"; @@ -4568,7 +4828,7 @@ const char* apzUnixware7_Byteorder_FixPatch[] = { "sed", * * Description of Va_I960_Macro fix */ -#define VA_I960_MACRO_FIXIDX 113 +#define VA_I960_MACRO_FIXIDX 120 tSCC zVa_I960_MacroName[] = "va_i960_macro"; @@ -4604,7 +4864,7 @@ const char* apzVa_I960_MacroPatch[] = { * * Description of Void_Null fix */ -#define VOID_NULL_FIXIDX 114 +#define VOID_NULL_FIXIDX 121 tSCC zVoid_NullName[] = "void_null"; @@ -4640,7 +4900,7 @@ const char* apzVoid_NullPatch[] = { * * Description of Vxworks_Gcc_Problem fix */ -#define VXWORKS_GCC_PROBLEM_FIXIDX 115 +#define VXWORKS_GCC_PROBLEM_FIXIDX 122 tSCC zVxworks_Gcc_ProblemName[] = "vxworks_gcc_problem"; @@ -4690,7 +4950,7 @@ const char* apzVxworks_Gcc_ProblemPatch[] = { "sed", * * Description of Vxworks_Needs_Vxtypes fix */ -#define VXWORKS_NEEDS_VXTYPES_FIXIDX 116 +#define VXWORKS_NEEDS_VXTYPES_FIXIDX 123 tSCC zVxworks_Needs_VxtypesName[] = "vxworks_needs_vxtypes"; @@ -4726,7 +4986,7 @@ const char* apzVxworks_Needs_VxtypesPatch[] = { * * Description of Vxworks_Needs_Vxworks fix */ -#define VXWORKS_NEEDS_VXWORKS_FIXIDX 117 +#define VXWORKS_NEEDS_VXWORKS_FIXIDX 124 tSCC zVxworks_Needs_VxworksName[] = "vxworks_needs_vxworks"; @@ -4775,7 +5035,7 @@ const char* apzVxworks_Needs_VxworksPatch[] = { "sed", * * Description of Vxworks_Time fix */ -#define VXWORKS_TIME_FIXIDX 118 +#define VXWORKS_TIME_FIXIDX 125 tSCC zVxworks_TimeName[] = "vxworks_time"; @@ -4826,7 +5086,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\ * * Description of X11_Class fix */ -#define X11_CLASS_FIXIDX 119 +#define X11_CLASS_FIXIDX 126 tSCC zX11_ClassName[] = "x11_class"; @@ -4866,7 +5126,7 @@ const char* apzX11_ClassPatch[] = { "sed", * * Description of X11_Class_Usage fix */ -#define X11_CLASS_USAGE_FIXIDX 120 +#define X11_CLASS_USAGE_FIXIDX 127 tSCC zX11_Class_UsageName[] = "x11_class_usage"; @@ -4909,7 +5169,7 @@ const char* apzX11_Class_UsagePatch[] = { * * Description of X11_New fix */ -#define X11_NEW_FIXIDX 121 +#define X11_NEW_FIXIDX 128 tSCC zX11_NewName[] = "x11_new"; @@ -4950,7 +5210,7 @@ const char* apzX11_NewPatch[] = { "sed", * * Description of X11_Sprintf fix */ -#define X11_SPRINTF_FIXIDX 122 +#define X11_SPRINTF_FIXIDX 129 tSCC zX11_SprintfName[] = "x11_sprintf"; @@ -4989,9 +5249,9 @@ const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 124 +#define REGEX_COUNT 129 #define MACH_LIST_SIZE_LIMIT 279 -#define FIX_COUNT 123 +#define FIX_COUNT 130 tFixDesc fixDescList[ FIX_COUNT ] = { { zAaa_Ki_IfaceName, zAaa_Ki_IfaceList, @@ -5059,6 +5319,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = { AAB_ULTRIX_ANSI_COMPAT_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, aAab_Ultrix_Ansi_CompatTests, apzAab_Ultrix_Ansi_CompatPatch }, + { zAab_Ultrix_LimitsName, zAab_Ultrix_LimitsList, + apzAab_Ultrix_LimitsMachs, + AAB_ULTRIX_LIMITS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, + aAab_Ultrix_LimitsTests, apzAab_Ultrix_LimitsPatch }, + + { zAab_Ultrix_MemoryName, zAab_Ultrix_MemoryList, + apzAab_Ultrix_MemoryMachs, + AAB_ULTRIX_MEMORY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, + aAab_Ultrix_MemoryTests, apzAab_Ultrix_MemoryPatch }, + + { zAab_Ultrix_StringName, zAab_Ultrix_StringList, + apzAab_Ultrix_StringMachs, + AAB_ULTRIX_STRING_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, + aAab_Ultrix_StringTests, apzAab_Ultrix_StringPatch }, + { zAix_SyswaitName, zAix_SyswaitList, apzAix_SyswaitMachs, AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -5319,11 +5594,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aNested_Auth_DesTests, apzNested_Auth_DesPatch }, - { zNested_UltrixName, zNested_UltrixList, - apzNested_UltrixMachs, - NESTED_ULTRIX_TEST_CT, FD_MACH_ONLY, - aNested_UltrixTests, apzNested_UltrixPatch }, - { zNews_Os_RecursionName, zNews_Os_RecursionList, apzNews_Os_RecursionMachs, NEWS_OS_RECURSION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -5521,7 +5791,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = { { zUltrix_Atof_ParamName, zUltrix_Atof_ParamList, apzUltrix_Atof_ParamMachs, - ULTRIX_ATOF_PARAM_TEST_CT, FD_MACH_ONLY, + ULTRIX_ATOF_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aUltrix_Atof_ParamTests, apzUltrix_Atof_ParamPatch }, { zUltrix_ConstName, zUltrix_ConstList, @@ -5536,19 +5806,44 @@ tFixDesc fixDescList[ FIX_COUNT ] = { { zUltrix_Fix_FixprotoName, zUltrix_Fix_FixprotoList, apzUltrix_Fix_FixprotoMachs, - ULTRIX_FIX_FIXPROTO_TEST_CT, FD_MACH_ONLY, + ULTRIX_FIX_FIXPROTO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aUltrix_Fix_FixprotoTests, apzUltrix_Fix_FixprotoPatch }, { zUltrix_IfdefName, zUltrix_IfdefList, apzUltrix_IfdefMachs, - ULTRIX_IFDEF_TEST_CT, FD_MACH_ONLY, + ULTRIX_IFDEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aUltrix_IfdefTests, apzUltrix_IfdefPatch }, + { zUltrix_Math_IfdefName, zUltrix_Math_IfdefList, + apzUltrix_Math_IfdefMachs, + ULTRIX_MATH_IFDEF_TEST_CT, FD_MACH_ONLY, + aUltrix_Math_IfdefTests, apzUltrix_Math_IfdefPatch }, + + { zUltrix_Nested_IoctlName, zUltrix_Nested_IoctlList, + apzUltrix_Nested_IoctlMachs, + ULTRIX_NESTED_IOCTL_TEST_CT, FD_MACH_ONLY, + aUltrix_Nested_IoctlTests, apzUltrix_Nested_IoctlPatch }, + + { zUltrix_Nested_SvcName, zUltrix_Nested_SvcList, + apzUltrix_Nested_SvcMachs, + ULTRIX_NESTED_SVC_TEST_CT, FD_MACH_ONLY, + aUltrix_Nested_SvcTests, apzUltrix_Nested_SvcPatch }, + + { zUltrix_StatName, zUltrix_StatList, + apzUltrix_StatMachs, + ULTRIX_STAT_TEST_CT, FD_MACH_ONLY, + aUltrix_StatTests, apzUltrix_StatPatch }, + { zUltrix_StaticName, zUltrix_StaticList, apzUltrix_StaticMachs, ULTRIX_STATIC_TEST_CT, FD_MACH_ONLY, aUltrix_StaticTests, apzUltrix_StaticPatch }, + { zUltrix_StringsName, zUltrix_StringsList, + apzUltrix_StringsMachs, + ULTRIX_STRINGS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aUltrix_StringsTests, apzUltrix_StringsPatch }, + { zUndefine_NullName, zUndefine_NullList, apzUndefine_NullMachs, UNDEFINE_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, -- 2.30.2