*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Tuesday November 9, 2004 at 11:12:40 PM UTC
+ * It has been AutoGen-ed Friday November 26, 2004 at 09:59:26 PM UTC
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT CVS-MERGE THIS FILE, EITHER Tue Nov 9 23:12:40 UTC 2004
+/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Nov 26 21:59:26 UTC 2004
*
* You must regenerate it. Use the ./genfixes script.
*
* 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 181 fixup descriptions.
+ * This file contains 177 fixup descriptions.
*
* See README for more information.
*
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Alpha_Pthread_Init fix
+ */
+tSCC zAlpha_Pthread_InitName[] =
+ "alpha_pthread_init";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAlpha_Pthread_InitList[] =
+ "|pthread.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAlpha_Pthread_InitMachs[] = {
+ "alpha*-dec-osf*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAlpha_Pthread_InitSelect0[] =
+ " \\* @\\(#\\).RCSfile: pthread\\.h,v \\$ .Revision: 1\\.1\\.33\\.21 \\$ \\(DEC\\) .Date: 2000/08/15 15:30:13 \\$";
+
+#define ALPHA_PTHREAD_INIT_TEST_CT 1
+static tTestDesc aAlpha_Pthread_InitTests[] = {
+ { TT_EGREP, zAlpha_Pthread_InitSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Alpha_Pthread_Init
+ */
+static const char* apzAlpha_Pthread_InitPatch[] = { "sed",
+ "-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\
+s@CVALID\\(.*\\)_}@CVALID\\1_, 0, 0 }@\n\
+s@WVALID\\(.*\\)A}@WVALID\\1A, 0, 0, 0, 0, 0, 0, 0, 0, 0 }@\n\
+s@WVALID\\(.*\\)_}@WVALID\\1_, 0, 0, 0, 0, 0, 0, 0 }@\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Alpha_Sbrk fix
*/
tSCC zAlpha_SbrkName[] =
/*
* Machine/OS name selection pattern
*/
-#define apzGnu_TypesMachs (const char**)NULL
+tSCC* apzGnu_TypesMachs[] = {
+ "*-*-solaris2.1[0-9]*",
+ (const char*)NULL };
/*
* content selection pattern - do fix if pattern found
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Hpux_Maxint fix
- */
-tSCC zHpux_MaxintName[] =
- "hpux_maxint";
-
-/*
- * File name selection pattern
- */
-tSCC zHpux_MaxintList[] =
- "|sys/param.h|values.h|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzHpux_MaxintMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zHpux_MaxintSelect0[] =
- "^#[ \t]*define[ \t]+MAXINT[ \t]";
-
-/*
- * content bypass pattern - skip fix if pattern found
- */
-tSCC zHpux_MaxintBypass0[] =
- "^#[ \t]*ifndef[ \t]+MAXINT";
-
-/*
- * perform the 'test' shell command - do fix on success
- */
-tSCC zHpux_MaxintTest0[] =
- "-n \"`egrep '#[ \t]*define[ \t]+MAXINT[ \t]' sys/param.h`\"";
-
-#define HPUX_MAXINT_TEST_CT 3
-static tTestDesc aHpux_MaxintTests[] = {
- { TT_TEST, zHpux_MaxintTest0, 0 /* unused */ },
- { TT_NEGREP, zHpux_MaxintBypass0, (regex_t*)NULL },
- { TT_EGREP, zHpux_MaxintSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Hpux_Maxint
- */
-static const char* apzHpux_MaxintPatch[] = {
- "format",
- "#ifndef MAXINT\n\
-%0\n\
-#endif",
- "^#[ \t]*define[ \t]+MAXINT[ \t].*",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Hpux_Systime fix
*/
tSCC zHpux_SystimeName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Limits_Ifndefs fix
- */
-tSCC zLimits_IfndefsName[] =
- "limits_ifndefs";
-
-/*
- * File name selection pattern
- */
-tSCC zLimits_IfndefsList[] =
- "|sys/limits.h|limits.h|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzLimits_IfndefsMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zLimits_IfndefsSelect0[] =
- "^[ \t]*#[ \t]*define[ \t]+((FLT|DBL)_(MIN|MAX|DIG))[ \t].*";
-
-/*
- * content bypass pattern - skip fix if pattern found
- */
-tSCC zLimits_IfndefsBypass0[] =
- "ifndef[ \t]+FLT_(MIN|MAX)";
-
-#define LIMITS_IFNDEFS_TEST_CT 2
-static tTestDesc aLimits_IfndefsTests[] = {
- { TT_NEGREP, zLimits_IfndefsBypass0, (regex_t*)NULL },
- { TT_EGREP, zLimits_IfndefsSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Limits_Ifndefs
- */
-static const char* apzLimits_IfndefsPatch[] = {
- "format",
- "#ifndef %1\n\
-%0\n\
-#endif",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Linux_Ia64_Ucontext fix
*/
tSCC zLinux_Ia64_UcontextName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Math_Huge_Val_Ifndef fix
- */
-tSCC zMath_Huge_Val_IfndefName[] =
- "math_huge_val_ifndef";
-
-/*
- * File name selection pattern
- */
-tSCC zMath_Huge_Val_IfndefList[] =
- "|math.h|math/math.h|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzMath_Huge_Val_IfndefMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zMath_Huge_Val_IfndefSelect0[] =
- "define[ \t]+HUGE_VAL";
-
-#define MATH_HUGE_VAL_IFNDEF_TEST_CT 1
-static tTestDesc aMath_Huge_Val_IfndefTests[] = {
- { TT_EGREP, zMath_Huge_Val_IfndefSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Math_Huge_Val_Ifndef
- */
-static const char* apzMath_Huge_Val_IfndefPatch[] = {
- "format",
- "#ifndef HUGE_VAL\n\
-%0\n\
-#endif",
- "^[ \t]*#[ \t]*define[ \t]+HUGE_VAL[ \t].*",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Nested_Auth_Des fix
*/
tSCC zNested_Auth_DesName[] =
tSCC zSco_MathSelect0[] =
"inline double abs";
-#define SCO_MATH_TEST_CT 1
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zSco_MathBypass0[] =
+ "__GNUG__";
+
+#define SCO_MATH_TEST_CT 2
static tTestDesc aSco_MathTests[] = {
+ { TT_NEGREP, zSco_MathBypass0, (regex_t*)NULL },
{ TT_EGREP, zSco_MathSelect0, (regex_t*)NULL }, };
/*
tSCC zSolaris_Stdio_TagSelect0[] =
"__cplusplus < 54321L";
-#define SOLARIS_STDIO_TAG_TEST_CT 1
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Stdio_TagBypass0[] =
+ "__GNUC__";
+
+#define SOLARIS_STDIO_TAG_TEST_CT 2
static tTestDesc aSolaris_Stdio_TagTests[] = {
+ { TT_NEGREP, zSolaris_Stdio_TagBypass0, (regex_t*)NULL },
{ TT_EGREP, zSolaris_Stdio_TagSelect0, (regex_t*)NULL }, };
/*
/*
* Machine/OS name selection pattern
*/
-#define apzStdio_Stdarg_HMachs (const char**)NULL
+tSCC* apzStdio_Stdarg_HMachs[] = {
+ "*-*-solaris2.1[0-9]",
+ (const char*)NULL };
/*
* content bypass pattern - skip fix if pattern found
/*
* Machine/OS name selection pattern
*/
-#define apzStdio_Va_ListMachs (const char**)NULL
+tSCC* apzStdio_Va_ListMachs[] = {
+ "*-*-solaris2.1[0-9]",
+ (const char*)NULL };
/*
* content bypass pattern - skip fix if pattern found
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Svr4__P fix
- */
-tSCC zSvr4__PName[] =
- "svr4__p";
-
-/*
- * File name selection pattern
- */
-tSCC zSvr4__PList[] =
- "|math.h|floatingpoint.h|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSvr4__PMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zSvr4__PSelect0[] =
- "^#define[ \t]+__P.*";
-
-#define SVR4__P_TEST_CT 1
-static tTestDesc aSvr4__PTests[] = {
- { TT_EGREP, zSvr4__PSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Svr4__P
- */
-static const char* apzSvr4__PPatch[] = {
- "format",
- "#ifndef __P\n\
-%0\n\
-#endif",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Svr4_Disable_Opt fix
*/
tSCC zSvr4_Disable_OptName[] =
tSCC zSysz_Stdlib_For_SunSelect0[] =
"char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\(";
-#define SYSZ_STDLIB_FOR_SUN_TEST_CT 1
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zSysz_Stdlib_For_SunBypass0[] =
+ "_CLASSIC_ANSI_TYPES";
+
+#define SYSZ_STDLIB_FOR_SUN_TEST_CT 2
static tTestDesc aSysz_Stdlib_For_SunTests[] = {
+ { TT_NEGREP, zSysz_Stdlib_For_SunBypass0, (regex_t*)NULL },
{ TT_EGREP, zSysz_Stdlib_For_SunSelect0, (regex_t*)NULL }, };
/*
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Undefine_Null fix
- */
-tSCC zUndefine_NullName[] =
- "undefine_null";
-
-/*
- * File name selection pattern
- */
-#define zUndefine_NullList (char*)NULL
-/*
- * Machine/OS name selection pattern
- */
-#define apzUndefine_NullMachs (const char**)NULL
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zUndefine_NullSelect0[] =
- "^#[ \t]*define[ \t]+NULL[ \t]";
-
-/*
- * content bypass pattern - skip fix if pattern found
- */
-tSCC zUndefine_NullBypass0[] =
- "#[ \t]*(ifn|un)def[ \t]+NULL($|[ \t\r])";
-
-#define UNDEFINE_NULL_TEST_CT 2
-static tTestDesc aUndefine_NullTests[] = {
- { TT_NEGREP, zUndefine_NullBypass0, (regex_t*)NULL },
- { TT_EGREP, zUndefine_NullSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Undefine_Null
- */
-static const char* apzUndefine_NullPatch[] = {
- "format",
- "#ifndef NULL\n\
-#define NULL%1\n\
-#endif\n",
- "^#[ \t]*define[ \t]+NULL([^\r\n\
-]+)[\r]*\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Unicosmk_Restrict fix
*/
tSCC zUnicosmk_RestrictName[] =
*
* List of all fixes
*/
-#define REGEX_COUNT 211
+#define REGEX_COUNT 207
#define MACH_LIST_SIZE_LIMIT 261
-#define FIX_COUNT 181
+#define FIX_COUNT 177
/*
* Enumerate the fixes
ALPHA_PARENS_FIXIDX,
ALPHA_PTHREAD_FIXIDX,
ALPHA_PTHREAD_GCC_FIXIDX,
+ ALPHA_PTHREAD_INIT_FIXIDX,
ALPHA_SBRK_FIXIDX,
ALPHA_WCHAR_FIXIDX,
AVOID_BOOL_DEFINE_FIXIDX,
HPUX8_BOGUS_INLINES_FIXIDX,
HPUX_CTYPE_MACROS_FIXIDX,
HPUX_LONG_DOUBLE_FIXIDX,
- HPUX_MAXINT_FIXIDX,
HPUX_SYSTIME_FIXIDX,
INT_ABORT_FREE_AND_EXIT_FIXIDX,
IO_QUOTES_DEF_FIXIDX,
KANDR_CONCAT_FIXIDX,
LIBC1_G_VA_LIST_FIXIDX,
LIBC1_IFDEFD_MEMX_FIXIDX,
- LIMITS_IFNDEFS_FIXIDX,
LINUX_IA64_UCONTEXT_FIXIDX,
LYNXOS_NO_WARNING_IN_SYS_TIME_H_FIXIDX,
LYNXOS_MISSING_PUTENV_FIXIDX,
MACHINE_NAME_FIXIDX,
MATH_EXCEPTION_FIXIDX,
MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX,
- MATH_HUGE_VAL_IFNDEF_FIXIDX,
NESTED_AUTH_DES_FIXIDX,
NESTED_MOTOROLA_FIXIDX,
NESTED_SYS_LIMITS_FIXIDX,
SUN_RUSERS_SEMI_FIXIDX,
SUN_SIGNAL_FIXIDX,
SUNOS_STRLEN_FIXIDX,
- SVR4__P_FIXIDX,
SVR4_DISABLE_OPT_FIXIDX,
SVR4_GETCWD_FIXIDX,
SVR4_KRNL_FIXIDX,
ULTRIX_STRINGS2_FIXIDX,
ULTRIX_SYS_TIME_FIXIDX,
ULTRIX_UNISTD_FIXIDX,
- UNDEFINE_NULL_FIXIDX,
UNICOSMK_RESTRICT_FIXIDX,
UW7_BYTEORDER_FIX_FIXIDX,
VA_I960_MACRO_FIXIDX,
ALPHA_PTHREAD_GCC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAlpha_Pthread_GccTests, apzAlpha_Pthread_GccPatch, 0 },
+ { zAlpha_Pthread_InitName, zAlpha_Pthread_InitList,
+ apzAlpha_Pthread_InitMachs,
+ ALPHA_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY,
+ aAlpha_Pthread_InitTests, apzAlpha_Pthread_InitPatch, 0 },
+
{ zAlpha_SbrkName, zAlpha_SbrkList,
apzAlpha_SbrkMachs,
ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
{ zGnu_TypesName, zGnu_TypesList,
apzGnu_TypesMachs,
- GNU_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ GNU_TYPES_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE,
aGnu_TypesTests, apzGnu_TypesPatch, 0 },
{ zHp_InlineName, zHp_InlineList,
HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY,
aHpux_Long_DoubleTests, apzHpux_Long_DoublePatch, 0 },
- { zHpux_MaxintName, zHpux_MaxintList,
- apzHpux_MaxintMachs,
- HPUX_MAXINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aHpux_MaxintTests, apzHpux_MaxintPatch, 0 },
-
{ zHpux_SystimeName, zHpux_SystimeList,
apzHpux_SystimeMachs,
HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
LIBC1_IFDEFD_MEMX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aLibc1_Ifdefd_MemxTests, apzLibc1_Ifdefd_MemxPatch, 0 },
- { zLimits_IfndefsName, zLimits_IfndefsList,
- apzLimits_IfndefsMachs,
- LIMITS_IFNDEFS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aLimits_IfndefsTests, apzLimits_IfndefsPatch, 0 },
-
{ zLinux_Ia64_UcontextName, zLinux_Ia64_UcontextList,
apzLinux_Ia64_UcontextMachs,
LINUX_IA64_UCONTEXT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
MATH_HUGE_VAL_FROM_DBL_MAX_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
aMath_Huge_Val_From_Dbl_MaxTests, apzMath_Huge_Val_From_Dbl_MaxPatch, 0 },
- { zMath_Huge_Val_IfndefName, zMath_Huge_Val_IfndefList,
- apzMath_Huge_Val_IfndefMachs,
- MATH_HUGE_VAL_IFNDEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aMath_Huge_Val_IfndefTests, apzMath_Huge_Val_IfndefPatch, 0 },
-
{ zNested_Auth_DesName, zNested_Auth_DesList,
apzNested_Auth_DesMachs,
NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
{ zStdio_Stdarg_HName, zStdio_Stdarg_HList,
apzStdio_Stdarg_HMachs,
- STDIO_STDARG_H_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ STDIO_STDARG_H_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE,
aStdio_Stdarg_HTests, apzStdio_Stdarg_HPatch, 0 },
{ zStdio_Va_ListName, zStdio_Va_ListList,
apzStdio_Va_ListMachs,
- STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY,
+ STDIO_VA_LIST_TEST_CT, FD_MACH_IFNOT,
aStdio_Va_ListTests, apzStdio_Va_ListPatch, 0 },
{ zStdio_Va_List_ClientsName, zStdio_Va_List_ClientsList,
SUNOS_STRLEN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aSunos_StrlenTests, apzSunos_StrlenPatch, 0 },
- { zSvr4__PName, zSvr4__PList,
- apzSvr4__PMachs,
- SVR4__P_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aSvr4__PTests, apzSvr4__PPatch, 0 },
-
{ zSvr4_Disable_OptName, zSvr4_Disable_OptList,
apzSvr4_Disable_OptMachs,
SVR4_DISABLE_OPT_TEST_CT, FD_MACH_ONLY,
ULTRIX_UNISTD_TEST_CT, FD_MACH_ONLY,
aUltrix_UnistdTests, apzUltrix_UnistdPatch, 0 },
- { zUndefine_NullName, zUndefine_NullList,
- apzUndefine_NullMachs,
- UNDEFINE_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aUndefine_NullTests, apzUndefine_NullPatch, 0 },
-
{ zUnicosmk_RestrictName, zUnicosmk_RestrictList,
apzUnicosmk_RestrictMachs,
UNICOSMK_RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,