diff options
Diffstat (limited to 'fixincludes/fixincl.x')
| -rw-r--r-- | fixincludes/fixincl.x | 246 |
1 files changed, 127 insertions, 119 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index f91bb3a1ca5..aa256892178 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 Sunday June 8, 2008 at 09:19:13 AM PDT + * It has been AutoGen-ed Saturday September 6, 2008 at 11:42:15 AM PDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jun 8 09:19:13 PDT 2008 +/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Sep 6 11:42:15 PDT 2008 * * You must regenerate it. Use the ./genfixes script. * @@ -36,6 +36,10 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef SED_PROGRAM +#define SED_PROGRAM "/usr/bin/sed" +#endif +static char const sed_cmd_z[] = SED_PROGRAM; /* * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -873,7 +877,7 @@ static tTestDesc aAlpha_Bad_LvalTests[] = { /* * Fix Command Arguments for Alpha_Bad_Lval */ -static const char* apzAlpha_Bad_LvalPatch[] = { "sed", +static const char* apzAlpha_Bad_LvalPatch[] = { sed_cmd_z, "-e", "s/^[ \t]*#[ \t]*define[ \t][ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*\\(_.*\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/", (char*)NULL }; @@ -1058,7 +1062,7 @@ static tTestDesc aAlpha_Pthread_InitTests[] = { /* * Fix Command Arguments for Alpha_Pthread_Init */ -static const char* apzAlpha_Pthread_InitPatch[] = { "sed", +static const char* apzAlpha_Pthread_InitPatch[] = { sed_cmd_z, "-e", "s@MVALID\\(.*\\)A}@MVALID\\1A, 0, 0, 0, 0, 0, 0 }@\n\ s@MVALID\\(.*\\)_}@MVALID\\1_, 0, 0, 0, 0 }@\n\ s@CVALID\\(.*\\)A}@CVALID\\1A, 0, 0, 0, 0 }@\n\ @@ -1134,7 +1138,7 @@ static tTestDesc aAlpha_WcharTests[] = { /* * Fix Command Arguments for Alpha_Wchar */ -static const char* apzAlpha_WcharPatch[] = { "sed", +static const char* apzAlpha_WcharPatch[] = { sed_cmd_z, "-e", "s@#define wcstok wcstok_r@extern wchar_t *wcstok __((wchar_t *, const wchar_t *, wchar_t **)) __asm__(\"wcstok_r\");@", "-e", "s@#define wcsftime __wcsftime_isoc@extern size_t wcsftime __((wchar_t *, size_t, const wchar_t *, const struct tm *)) __asm__(\"__wcsftime_isoc\");@", (char*)NULL }; @@ -1463,7 +1467,7 @@ static tTestDesc aBroken_CabsTests[] = { /* * Fix Command Arguments for Broken_Cabs */ -static const char* apzBroken_CabsPatch[] = { "sed", +static const char* apzBroken_CabsPatch[] = { sed_cmd_z, "-e", "s/^extern[ \t]*double[ \t]*cabs[ \t]*([^\\)]*);//", "-e", "s/^extern[ \t]*long[ \t]*double[ \t]*cabsl[ \t]*([^\\)]*);//", (char*)NULL }; @@ -1807,7 +1811,7 @@ tSCC zDec_Intern_AsmList[] = /* * Fix Command Arguments for Dec_Intern_Asm */ -static const char* apzDec_Intern_AsmPatch[] = { "sed", +static const char* apzDec_Intern_AsmPatch[] = { sed_cmd_z, "-e", "/^[ \t]*float[ \t]*fasm/i\\\n\ #ifdef __DECC\n", "-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n\ @@ -2117,7 +2121,7 @@ static tTestDesc aGlibc_C99_Inline_2Tests[] = { /* * Fix Command Arguments for Glibc_C99_Inline_2 */ -static const char* apzGlibc_C99_Inline_2Patch[] = { "sed", +static const char* apzGlibc_C99_Inline_2Patch[] = { sed_cmd_z, "-e", "s/extern int \\(stat\\|lstat\\|fstat\\|mknod\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ extern\\\n\ #endif\\\n\ @@ -2247,8 +2251,11 @@ static tTestDesc aGlibc_Mutex_InitTests[] = { /* * Fix Command Arguments for Glibc_Mutex_Init */ -static const char* apzGlibc_Mutex_InitPatch[] = { "sed", - "-e", "/define[ \t]\\+PTHREAD_MUTEX_INITIALIZER[ \t]*\\\\/,+1s/{ { 0, } }/{ { 0, 0, 0, 0, 0, 0 } }/", +static const char* apzGlibc_Mutex_InitPatch[] = { sed_cmd_z, + "-e", "/define[ \t]\\+PTHREAD_MUTEX_INITIALIZER[ \t]*\\\\/{\n\ +N\n\ +s/{ { 0, } }/{ { 0, 0, 0, 0, 0, 0 } }/\n\ +}", "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\|ERRORCHECK\\|ADAPTIVE\\)_NP\\) }/{ \\1, 0 }/", "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\|ERRORCHECK\\|ADAPTIVE\\)_NP\\) }/{ \\1, 0, 0 }/", "-e", "/define[ \t]\\+PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\/N;s/^[ \t]*#[ \t]*\\(define[ \t]\\+PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\\\)\\n[ \t]*{ { 0, } }/# if __WORDSIZE == 64\\n# \\1\\n { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }\\n# else\\n# \\1\\n { { 0, 0, 0, 0, 0, 0, 0, 0 } }\\n# endif/", @@ -2373,6 +2380,51 @@ static const char* apzHp_SysfilePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hppa_Hpux_Fp_Macros fix + */ +tSCC zHppa_Hpux_Fp_MacrosName[] = + "hppa_hpux_fp_macros"; + +/* + * File name selection pattern + */ +tSCC zHppa_Hpux_Fp_MacrosList[] = + "math.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHppa_Hpux_Fp_MacrosMachs[] = { + "hppa*-hp-hpux11*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHppa_Hpux_Fp_MacrosSelect0[] = + "#[ \t]*define[ \t]*FP_NORMAL.*\n\ +#[ \t]*define[ \t]*FP_ZERO.*\n\ +#[ \t]*define[ \t]*FP_INFINITE.*\n\ +#[ \t]*define[ \t]*FP_SUBNORMAL.*\n\ +#[ \t]*define[ \t]*FP_NAN.*\n"; + +#define HPPA_HPUX_FP_MACROS_TEST_CT 1 +static tTestDesc aHppa_Hpux_Fp_MacrosTests[] = { + { TT_EGREP, zHppa_Hpux_Fp_MacrosSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hppa_Hpux_Fp_Macros + */ +static const char* apzHppa_Hpux_Fp_MacrosPatch[] = { + "format", + "#endif /* _INCLUDE_HPUX_SOURCE */\n\n\ +#if defined(_INCLUDE_HPUX_SOURCE) || \\\n\ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))\n\ +%0#endif\n\n\ +#ifdef _INCLUDE_HPUX_SOURCE\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Hpux10_Cpp_Pow_Inline fix */ tSCC zHpux10_Cpp_Pow_InlineName[] = @@ -2452,50 +2504,6 @@ static const char* apzHpux11_Cpp_Pow_InlinePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hppa_Hpux_Fp_Macros fix - */ -tSCC zHppa_Hpux_Fp_MacrosName[] = - "hppa_hpux_fp_macros"; - -/* - * File name selection pattern - */ -tSCC zHppa_Hpux_Fp_MacrosList[] = - "math.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzHppa_Hpux_Fp_MacrosMachs[] = { - "hppa*-hp-hpux11*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zHppa_Hpux_Fp_MacrosSelect0[] = - "#[ \t]*define[ \t]*FP_NORMAL.*\n\ -#[ \t]*define[ \t]*FP_ZERO.*\n\ -#[ \t]*define[ \t]*FP_INFINITE.*\n\ -#[ \t]*define[ \t]*FP_SUBNORMAL.*\n\ -#[ \t]*define[ \t]*FP_NAN.*\n"; - -#define HPPA_HPUX_FP_MACROS_TEST_CT 1 -static tTestDesc aHppa_Hpux_Fp_MacrosTests[] = { - { TT_EGREP, zHppa_Hpux_Fp_MacrosSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Hppa_Hpux_Fp_Macros - */ -static const char* apzHppa_Hpux_Fp_MacrosPatch[] = { - "format", - "#endif /* _INCLUDE_HPUX_SOURCE */\n\n\ -#if defined(_INCLUDE_HPUX_SOURCE) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))\n\ -%0#endif\n\n\ -#ifdef _INCLUDE_HPUX_SOURCE\n", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Hpux10_Ctype_Declarations1 fix */ tSCC zHpux10_Ctype_Declarations1Name[] = @@ -2742,6 +2750,43 @@ static const char* apzHpux11_FabsfPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hpux11_Pthread_Const fix + */ +tSCC zHpux11_Pthread_ConstName[] = + "hpux11_pthread_const"; + +/* + * File name selection pattern + */ +tSCC zHpux11_Pthread_ConstList[] = + "sys/pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux11_Pthread_ConstMachs[] = { + "*-hp-hpux11.[0-3]*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux11_Pthread_ConstSelect0[] = + "^#define[ \t]*__POINTER_SET[ \t]*\\(\\(void \\*\\) 1LL\\)"; + +#define HPUX11_PTHREAD_CONST_TEST_CT 1 +static tTestDesc aHpux11_Pthread_ConstTests[] = { + { TT_EGREP, zHpux11_Pthread_ConstSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux11_Pthread_Const + */ +static const char* apzHpux11_Pthread_ConstPatch[] = { + "format", + "#define __POINTER_SET\t\t((void *) 1L)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Hpux11_Size_T fix */ tSCC zHpux11_Size_TName[] = @@ -2918,7 +2963,7 @@ static tTestDesc aHpux8_Bogus_InlinesTests[] = { /* * Fix Command Arguments for Hpux8_Bogus_Inlines */ -static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed", +static const char* apzHpux8_Bogus_InlinesPatch[] = { sed_cmd_z, "-e", "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@", "-e", "s@inline double abs(double [a-z][a-z]*) {.*}@@", "-e", "s@inline int sqr(int [a-z][a-z]*) {.*}@@", @@ -3037,7 +3082,7 @@ static tTestDesc aHpux_Long_DoubleTests[] = { /* * Fix Command Arguments for Hpux_Long_Double */ -static const char* apzHpux_Long_DoublePatch[] = { "sed", +static const char* apzHpux_Long_DoublePatch[] = { sed_cmd_z, "-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D", "-e", "s/long_double/long double/g", (char*)NULL }; @@ -3240,43 +3285,6 @@ extern \"C\" {\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux11_Pthread_Const fix - */ -tSCC zHpux11_Pthread_ConstName[] = - "hpux11_pthread_const"; - -/* - * File name selection pattern - */ -tSCC zHpux11_Pthread_ConstList[] = - "sys/pthread.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzHpux11_Pthread_ConstMachs[] = { - "*-hp-hpux11.[0-3]*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zHpux11_Pthread_ConstSelect0[] = - "^#define[ \t]*__POINTER_SET[ \t]*\\(\\(void \\*\\) 1LL\\)"; - -#define HPUX11_PTHREAD_CONST_TEST_CT 1 -static tTestDesc aHpux11_Pthread_ConstTests[] = { - { TT_EGREP, zHpux11_Pthread_ConstSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Hpux11_Pthread_Const - */ -static const char* apzHpux11_Pthread_ConstPatch[] = { - "format", - "#define __POINTER_SET\t\t((void *) 1L)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Hpux_Pthread_Initializers fix */ tSCC zHpux_Pthread_InitializersName[] = @@ -3299,7 +3307,7 @@ tSCC* apzHpux_Pthread_InitializersMachs[] = { /* * Fix Command Arguments for Hpux_Pthread_Initializers */ -static const char* apzHpux_Pthread_InitializersPatch[] = { "sed", +static const char* apzHpux_Pthread_InitializersPatch[] = { sed_cmd_z, "-e", "s@^[ \t]*1, 1, 1, 1,[ \t]*\\\\@\t{ 1, 1, 1, 1 },\t\t\t\t\t\t\t\\\\@", "-e", "s@^[ \t]*1,[ \t]*\\\\@\t{ 1, 0 }@", "-e", "/^[ \t]*0$/d", @@ -3581,7 +3589,7 @@ static tTestDesc aIp_Missing_SemiTests[] = { /* * Fix Command Arguments for Ip_Missing_Semi */ -static const char* apzIp_Missing_SemiPatch[] = { "sed", +static const char* apzIp_Missing_SemiPatch[] = { sed_cmd_z, "-e", "/^struct/,/^};/s/}$/};/", (char*)NULL }; @@ -4387,7 +4395,7 @@ static tTestDesc aNested_Sys_LimitsTests[] = { /* * Fix Command Arguments for Nested_Sys_Limits */ -static const char* apzNested_Sys_LimitsPatch[] = { "sed", +static const char* apzNested_Sys_LimitsPatch[] = { sed_cmd_z, "-e", "/CHILD_MAX/s,/\\* Max, Max,", "-e", "/OPEN_MAX/s,/\\* Max, Max,", (char*)NULL }; @@ -5148,7 +5156,7 @@ static tTestDesc aSco_MathTests[] = { /* * Fix Command Arguments for Sco_Math */ -static const char* apzSco_MathPatch[] = { "sed", +static const char* apzSco_MathPatch[] = { sed_cmd_z, "-e", "/#define.*__fp_class(a) \\\\/i\\\n\ #ifndef __GNUC__\n", "-e", "/.*__builtin_generic/a\\\n\ @@ -5671,7 +5679,7 @@ static tTestDesc aSolaris_Stdio_TagTests[] = { /* * Fix Command Arguments for Solaris_Stdio_Tag */ -static const char* apzSolaris_Stdio_TagPatch[] = { "sed", +static const char* apzSolaris_Stdio_TagPatch[] = { sed_cmd_z, "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/", (char*)NULL }; @@ -5780,7 +5788,7 @@ static tTestDesc aStdio_Va_ListTests[] = { /* * Fix Command Arguments for Stdio_Va_List */ -static const char* apzStdio_Va_ListPatch[] = { "sed", +static const char* apzStdio_Va_ListPatch[] = { sed_cmd_z, "-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\ s@(va_list)&@(__gnuc_va_list)\\&@\n\ s@ _VA_LIST_));@ __gnuc_va_list));@\n\ @@ -5830,7 +5838,7 @@ static tTestDesc aStdio_Va_List_ClientsTests[] = { /* * Fix Command Arguments for Stdio_Va_List_Clients */ -static const char* apzStdio_Va_List_ClientsPatch[] = { "sed", +static const char* apzStdio_Va_List_ClientsPatch[] = { sed_cmd_z, "-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\ s@(va_list)&@(__gnuc_va_list)\\&@\n\ s@ _VA_LIST_));@ __gnuc_va_list));@\n\ @@ -6211,7 +6219,7 @@ static tTestDesc aSun_MallocTests[] = { /* * Fix Command Arguments for Sun_Malloc */ -static const char* apzSun_MallocPatch[] = { "sed", +static const char* apzSun_MallocPatch[] = { sed_cmd_z, "-e", "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g", "-e", "s/int[ \t][ \t]*free/void\tfree/g", "-e", "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g", @@ -6249,7 +6257,7 @@ static tTestDesc aSun_Rusers_SemiTests[] = { /* * Fix Command Arguments for Sun_Rusers_Semi */ -static const char* apzSun_Rusers_SemiPatch[] = { "sed", +static const char* apzSun_Rusers_SemiPatch[] = { sed_cmd_z, "-e", "/^struct/,/^};/s/_cnt$/_cnt;/", (char*)NULL }; @@ -6357,7 +6365,7 @@ static tTestDesc aSvr4_Disable_OptTests[] = { /* * Fix Command Arguments for Svr4_Disable_Opt */ -static const char* apzSvr4_Disable_OptPatch[] = { "sed", +static const char* apzSvr4_Disable_OptPatch[] = { sed_cmd_z, "-e", "/#define.*__std_hdr_/d", (char*)NULL }; @@ -6547,7 +6555,7 @@ static tTestDesc aSysv68_StringTests[] = { /* * Fix Command Arguments for Sysv68_String */ -static const char* apzSysv68_StringPatch[] = { "sed", +static const char* apzSysv68_StringPatch[] = { sed_cmd_z, "-e", "s/extern[ \t]*int[ \t]*strlen();/extern unsigned int strlen();/", "-e", "s/extern[ \t]*int[ \t]*ffs[ \t]*(long);/extern int ffs(int);/", "-e", "s/strdup(char \\*s1);/strdup(const char *s1);/", @@ -6852,7 +6860,7 @@ static tTestDesc aVxworks_Gcc_ProblemTests[] = { /* * Fix Command Arguments for Vxworks_Gcc_Problem */ -static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed", +static const char* apzVxworks_Gcc_ProblemPatch[] = { sed_cmd_z, "-e", "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/", "-e", "/[ \t]size_t/i\\\n\ #ifndef _GCC_SIZE_T\\\n\ @@ -6949,7 +6957,7 @@ static tTestDesc aVxworks_Needs_VxworksTests[] = { /* * Fix Command Arguments for Vxworks_Needs_Vxworks */ -static const char* apzVxworks_Needs_VxworksPatch[] = { "sed", +static const char* apzVxworks_Needs_VxworksPatch[] = { sed_cmd_z, "-e", "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n\ #include <types/vxTypesOld.h>\n", (char*)NULL }; @@ -7122,7 +7130,7 @@ static tTestDesc aX11_NewTests[] = { /* * Fix Command Arguments for X11_New */ -static const char* apzX11_NewPatch[] = { "sed", +static const char* apzX11_NewPatch[] = { sed_cmd_z, "-e", "/Widget\told, new;/i\\\n\ #ifdef __cplusplus\\\n\ \tWidget\told, c_new;\\\n\ @@ -7239,14 +7247,15 @@ typedef enum { GNU_TYPES_FIXIDX, HP_INLINE_FIXIDX, HP_SYSFILE_FIXIDX, + HPPA_HPUX_FP_MACROS_FIXIDX, HPUX10_CPP_POW_INLINE_FIXIDX, HPUX11_CPP_POW_INLINE_FIXIDX, - HPPA_HPUX_FP_MACROS_FIXIDX, HPUX10_CTYPE_DECLARATIONS1_FIXIDX, HPUX10_CTYPE_DECLARATIONS2_FIXIDX, HPUX10_STDIO_DECLARATIONS_FIXIDX, HPUX11_ABS_FIXIDX, HPUX11_FABSF_FIXIDX, + HPUX11_PTHREAD_CONST_FIXIDX, HPUX11_SIZE_T_FIXIDX, HPUX11_SNPRINTF_FIXIDX, HPUX11_UINT32_C_FIXIDX, @@ -7260,7 +7269,6 @@ typedef enum { HPUX11_EXTERN_SENDFILE_FIXIDX, HPUX11_EXTERN_SENDPATH_FIXIDX, HPUX_EXTERN_ERRNO_FIXIDX, - HPUX11_PTHREAD_CONST_FIXIDX, HPUX_PTHREAD_INITIALIZERS_FIXIDX, HUGE_VAL_HEX_FIXIDX, HUGE_VALF_HEX_FIXIDX, @@ -7647,6 +7655,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HP_SYSFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHp_SysfileTests, apzHp_SysfilePatch, 0 }, + { zHppa_Hpux_Fp_MacrosName, zHppa_Hpux_Fp_MacrosList, + apzHppa_Hpux_Fp_MacrosMachs, + HPPA_HPUX_FP_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHppa_Hpux_Fp_MacrosTests, apzHppa_Hpux_Fp_MacrosPatch, 0 }, + { zHpux10_Cpp_Pow_InlineName, zHpux10_Cpp_Pow_InlineList, apzHpux10_Cpp_Pow_InlineMachs, HPUX10_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7657,11 +7670,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX11_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux11_Cpp_Pow_InlineTests, apzHpux11_Cpp_Pow_InlinePatch, 0 }, - { zHppa_Hpux_Fp_MacrosName, zHppa_Hpux_Fp_MacrosList, - apzHppa_Hpux_Fp_MacrosMachs, - HPPA_HPUX_FP_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aHppa_Hpux_Fp_MacrosTests, apzHppa_Hpux_Fp_MacrosPatch, 0 }, - { zHpux10_Ctype_Declarations1Name, zHpux10_Ctype_Declarations1List, apzHpux10_Ctype_Declarations1Machs, HPUX10_CTYPE_DECLARATIONS1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7687,6 +7695,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux11_FabsfTests, apzHpux11_FabsfPatch, 0 }, + { zHpux11_Pthread_ConstName, zHpux11_Pthread_ConstList, + apzHpux11_Pthread_ConstMachs, + HPUX11_PTHREAD_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux11_Pthread_ConstTests, apzHpux11_Pthread_ConstPatch, 0 }, + { zHpux11_Size_TName, zHpux11_Size_TList, apzHpux11_Size_TMachs, HPUX11_SIZE_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7752,11 +7765,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX_EXTERN_ERRNO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux_Extern_ErrnoTests, apzHpux_Extern_ErrnoPatch, 0 }, - { zHpux11_Pthread_ConstName, zHpux11_Pthread_ConstList, - apzHpux11_Pthread_ConstMachs, - HPUX11_PTHREAD_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aHpux11_Pthread_ConstTests, apzHpux11_Pthread_ConstPatch, 0 }, - { zHpux_Pthread_InitializersName, zHpux_Pthread_InitializersList, apzHpux_Pthread_InitializersMachs, HPUX_PTHREAD_INITIALIZERS_TEST_CT, FD_MACH_ONLY, |