-/*
- * DO NOT EDIT THIS FILE - it has been generated
+/* -*- buffer-read-only: t -*- vi: set ro:
+ *
+ * DO NOT EDIT THIS FILE (fixincl.x)
+ *
+ * It has been AutoGen-ed Saturday October 25, 2003 at 10:36:26 AM PDT
+ * From the definitions inclhack.def
+ * and the template file fixincl
+ */
+/* DO NOT CVS-MERGE THIS FILE, EITHER Sat Oct 25 10:36:26 PDT 2003
+ *
+ * You must regenerate it. Use the ./genfixes script.
+ *
*
- * Install modified versions of 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 is part of the fixincl program used to install modified versions of
+ * 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 148 fixup descriptions.
+ * This file contains 161 fixup descriptions.
*
* See README for more information.
*
files = sys/varargs.h;\n\
replace = \"/* This file was generated by fixincludes. */\\n\"\n\
\"#ifndef _SYS_VARARGS_H\\n\"\n\
- \"#define _SYS_VARARGS_H\\n\\n\"\n\
- \n\
+ \"#define _SYS_VARARGS_H\\n\\n\"\n\n\
\"#ifdef __STDC__\\n\"\n\
\"#include <stdarg.h>\\n\"\n\
\"#else\\n\"\n\
\"#include <varargs.h>\\n\"\n\
- \"#endif\\n\\n\"\n\
- \n\
+ \"#endif\\n\\n\"\n\n\
\"#endif /* _SYS_VARARGS_H */\\n\";\n\
};\n\
#endif\n\n\n\
/*\n\
- * Completely replace <sys/byteorder.h>; with a file that implements gcc's\n\
- * optimized byteswapping. Restricted to \"SVR4\" machines until either\n\
- * it is shown to be safe to replace this file always, or we get bolder ;-)\n\
+ * Completely replace <sys/byteorder.h> with a file that implements gcc's\n\
+ * optimized byteswapping. (The original probably implemented some\n\
+ * incompatible optimized byteswapping.)\n\
*/\n\
fix = {\n\
hackname = AAB_svr4_replace_byteorder;\n\
-#ifndef SVR5\n\
mach = \"*-*-sysv4*\";\n\
mach = \"i[34567]86-*-sysv5*\";\n\
+ mach = \"i[34567]86-*-sco3.2v5*\";\n\
mach = \"i[34567]86-*-udk*\";\n\
mach = \"i[34567]86-*-solaris2.[0-4]\";\n\
mach = \"powerpcle-*-solaris2.[0-4]\";\n\
mach = \"sparc-*-solaris2.[0-4]\";\n\
-#endif /* SVR5 */\n\
+ mach = \"i[34567]86-sequent-ptx*\";\n\
files = sys/byteorder.h;\n\
replace = <<- _EndOfHeader_\n\
#ifndef _SYS_BYTEORDER_H\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Alpha_Pthread fix
+ */
+tSCC zAlpha_PthreadName[] =
+ "alpha_pthread";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAlpha_PthreadList[] =
+ "|pthread.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAlpha_PthreadMachs[] = {
+ "alpha*-dec-osf*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAlpha_PthreadSelect0[] =
+ "(#[ \t]*if defined \\(_PTHREAD_ENV_DECC\\) || defined \\(_PTHREAD_ENV_EPCC\\))\n\
+(#[ \t]*define _PTHREAD_USE_PTDNAM_)";
+
+#define ALPHA_PTHREAD_TEST_CT 1
+static tTestDesc aAlpha_PthreadTests[] = {
+ { TT_EGREP, zAlpha_PthreadSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Alpha_Pthread
+ */
+static const char* apzAlpha_PthreadPatch[] = {
+ "format",
+ "%1 || defined (__PRAGMA_EXTERN_PREFIX)\n\
+%2",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Alpha_Pthread_Gcc fix
+ */
+tSCC zAlpha_Pthread_GccName[] =
+ "alpha_pthread_gcc";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAlpha_Pthread_GccList[] =
+ "|pthread.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAlpha_Pthread_GccMachs[] = {
+ "alpha*-dec-osf*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zAlpha_Pthread_GccSelect0[] =
+ "#else\n\
+# error <pthread.h>: unrecognized compiler.";
+
+#define ALPHA_PTHREAD_GCC_TEST_CT 1
+static tTestDesc aAlpha_Pthread_GccTests[] = {
+ { TT_EGREP, zAlpha_Pthread_GccSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Alpha_Pthread_Gcc
+ */
+static const char* apzAlpha_Pthread_GccPatch[] = {
+ "format",
+ "#elif defined (__GNUC__)\n\
+# define _PTHREAD_ENV_GCC\n\
+%0",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Alpha_Sbrk fix
*/
tSCC zAlpha_SbrkName[] =
* content bypass pattern - skip fix if pattern found
*/
tSCC zAvoid_Bool_DefineBypass0[] =
- "we must use the C\\+\\+ compiler's type";
+ "__cplusplus";
#define AVOID_BOOL_DEFINE_TEST_CT 2
static tTestDesc aAvoid_Bool_DefineTests[] = {
* content bypass pattern - skip fix if pattern found
*/
tSCC zAvoid_Bool_TypeBypass0[] =
- "we must use the C\\+\\+ compiler's type";
+ "__cplusplus";
#define AVOID_BOOL_TYPE_TEST_CT 2
static tTestDesc aAvoid_Bool_TypeTests[] = {
tSCC zAvoid_Wchar_T_TypeSelect0[] =
"^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;";
-#define AVOID_WCHAR_T_TYPE_TEST_CT 1
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zAvoid_Wchar_T_TypeBypass0[] =
+ "__cplusplus";
+tSCC zAvoid_Wchar_T_TypeBypass1[] =
+ "_LINUX_NLS_H";
+tSCC zAvoid_Wchar_T_TypeBypass2[] =
+ "XFree86: xc/lib/X11/Xlib\\.h";
+
+#define AVOID_WCHAR_T_TYPE_TEST_CT 4
static tTestDesc aAvoid_Wchar_T_TypeTests[] = {
+ { TT_NEGREP, zAvoid_Wchar_T_TypeBypass0, (regex_t*)NULL },
+ { TT_NEGREP, zAvoid_Wchar_T_TypeBypass1, (regex_t*)NULL },
+ { TT_NEGREP, zAvoid_Wchar_T_TypeBypass2, (regex_t*)NULL },
{ TT_EGREP, zAvoid_Wchar_T_TypeSelect0, (regex_t*)NULL }, };
/*
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Bsd_Stdio_Attrs_Conflict fix
- */
-tSCC zBsd_Stdio_Attrs_ConflictName[] =
- "bsd_stdio_attrs_conflict";
-
-/*
- * File name selection pattern
- */
-tSCC zBsd_Stdio_Attrs_ConflictList[] =
- "|stdio.h|";
-/*
- * Machine/OS name selection pattern
- */
-tSCC* apzBsd_Stdio_Attrs_ConflictMachs[] = {
- "*-*-*bsd*",
- "*-*-*darwin*",
- (const char*)NULL };
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zBsd_Stdio_Attrs_ConflictSelect0[] =
- "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$";
-
-#define BSD_STDIO_ATTRS_CONFLICT_TEST_CT 1
-static tTestDesc aBsd_Stdio_Attrs_ConflictTests[] = {
- { TT_EGREP, zBsd_Stdio_Attrs_ConflictSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Bsd_Stdio_Attrs_Conflict
- */
-static const char* apzBsd_Stdio_Attrs_ConflictPatch[] = {
- "format",
- "#define _BSD_STRING(_BSD_X) _BSD_STRINGX(_BSD_X)\n\
-#define _BSD_STRINGX(_BSD_X) #_BSD_X\n\
-int vfscanf(FILE *, const char *, __builtin_va_list) __asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) \"__svfscanf\");",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Broken_Assert_Stdio fix
*/
tSCC zBroken_Assert_StdioName[] =
* File name selection pattern
*/
tSCC zBroken_CabsList[] =
- "|math.h|";
+ "|math.h|architecture/ppc/math.h|architecture/i386/math.h|";
/*
* Machine/OS name selection pattern
*/
static const char* apzBroken_CabsPatch[] = {
"format",
"",
- "^extern[ \t]+double[ \t]+cabs\\((struct dbl_hypot|)\\);",
+ "^extern[ \t]+double[ \t]+cabs[ \t]*\\([^\\)]*\\);",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Bsd_Stdio_Attrs_Conflict fix
+ */
+tSCC zBsd_Stdio_Attrs_ConflictName[] =
+ "bsd_stdio_attrs_conflict";
+
+/*
+ * File name selection pattern
+ */
+tSCC zBsd_Stdio_Attrs_ConflictList[] =
+ "|stdio.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzBsd_Stdio_Attrs_ConflictMachs[] = {
+ "*-*-*bsd*",
+ "*-*-*darwin*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zBsd_Stdio_Attrs_ConflictSelect0[] =
+ "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$";
+
+#define BSD_STDIO_ATTRS_CONFLICT_TEST_CT 1
+static tTestDesc aBsd_Stdio_Attrs_ConflictTests[] = {
+ { TT_EGREP, zBsd_Stdio_Attrs_ConflictSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Bsd_Stdio_Attrs_Conflict
+ */
+static const char* apzBsd_Stdio_Attrs_ConflictPatch[] = {
+ "format",
+ "#define _BSD_STRING(_BSD_X) _BSD_STRINGX(_BSD_X)\n\
+#define _BSD_STRINGX(_BSD_X) #_BSD_X\n\
+int vfscanf(FILE *, const char *, __builtin_va_list) __asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) \"__svfscanf\");",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*/
tSCC zHpux10_Cpp_Pow_InlineSelect0[] =
"^# +ifdef +__cplusplus\n\
- +}\n\
- +inline +double +pow\\(double +__d,int +__expon\\) +{\n\
+ +\\}\n\
+ +inline +double +pow\\(double +__d,int +__expon\\) +\\{\n\
[ \t]+return +pow\\(__d,\\(double\\)__expon\\);\n\
- +}\n\
- +extern +\"C\" +{\n\
+ +\\}\n\
+ +extern +\"C\" +\\{\n\
#else\n\
# +endif";
* content selection pattern - do fix if pattern found
*/
tSCC zHpux11_Cpp_Pow_InlineSelect0[] =
- " +inline double pow\\(double d,int expon\\) {\n\
+ " +inline double pow\\(double d,int expon\\) \\{\n\
+return pow\\(d, \\(double\\)expon\\);\n\
- +}\n";
+ +\\}\n";
#define HPUX11_CPP_POW_INLINE_TEST_CT 1
static tTestDesc aHpux11_Cpp_Pow_InlineTests[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Hpux11_Snprintf fix
+ */
+tSCC zHpux11_SnprintfName[] =
+ "hpux11_snprintf";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux11_SnprintfList[] =
+ "|stdio.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzHpux11_SnprintfMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_SnprintfSelect0[] =
+ "(extern int snprintf *\\(char *\\*, *(|__|_hpux_)size_t,) *(char *\\*, *\\.\\.\\.\\);)";
+
+#define HPUX11_SNPRINTF_TEST_CT 1
+static tTestDesc aHpux11_SnprintfTests[] = {
+ { TT_EGREP, zHpux11_SnprintfSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Hpux11_Snprintf
+ */
+static const char* apzHpux11_SnprintfPatch[] = {
+ "format",
+ "%1 const %3",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Hpux11_Uint32_C fix
*/
tSCC zHpux11_Uint32_CName[] =
* File name selection pattern
*/
tSCC zIrix_Stdio_Va_ListList[] =
- "|stdio.h|";
+ "|stdio.h|internal/stdio_core.h|";
/*
* Machine/OS name selection pattern
*/
* content selection pattern - do fix if pattern found
*/
tSCC zIrix_Stdio_Va_ListSelect0[] =
- "(printf\\(.*), /\\* va_list \\*/ char \\*";
+ "/\\* va_list \\*/ char \\*";
#define IRIX_STDIO_VA_LIST_TEST_CT 1
static tTestDesc aIrix_Stdio_Va_ListTests[] = {
*/
static const char* apzIrix_Stdio_Va_ListPatch[] = {
"format",
- "%1, __gnuc_va_list",
+ "__gnuc_va_list",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
#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 1
+#define LIMITS_IFNDEFS_TEST_CT 2
static tTestDesc aLimits_IfndefsTests[] = {
- { TT_NEGREP, zLimits_IfndefsBypass0, (regex_t*)NULL }, };
+ { TT_NEGREP, zLimits_IfndefsBypass0, (regex_t*)NULL },
+ { TT_EGREP, zLimits_IfndefsSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Limits_Ifndefs
"#ifndef %1\n\
%0\n\
#endif",
- "^[ \t]*#[ \t]*define[ \t]+((FLT|DBL)_(MIN|MAX|DIG))[ \t].*",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
* content bypass pattern - skip fix if pattern found
*/
tSCC zMath_ExceptionBypass0[] =
- "We have a problem when using C\\+\\+";
+ "__cplusplus";
#define MATH_EXCEPTION_TEST_CT 2
static tTestDesc aMath_ExceptionTests[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Obstack_Lvalue_Cast fix
+ */
+tSCC zObstack_Lvalue_CastName[] =
+ "obstack_lvalue_cast";
+
+/*
+ * File name selection pattern
+ */
+tSCC zObstack_Lvalue_CastList[] =
+ "|obstack.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzObstack_Lvalue_CastMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zObstack_Lvalue_CastSelect0[] =
+ "\\*\\(\\(([^()]*)\\*\\)(.*)\\)\\+\\+ = \\(([^()]*)\\)";
+
+#define OBSTACK_LVALUE_CAST_TEST_CT 1
+static tTestDesc aObstack_Lvalue_CastTests[] = {
+ { TT_EGREP, zObstack_Lvalue_CastSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Obstack_Lvalue_Cast
+ */
+static const char* apzObstack_Lvalue_CastPatch[] = {
+ "format",
+ "((*((%1*)%2) = (%3)), (%2 += sizeof (%1)))",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Osf_Namespace_A fix
*/
tSCC zOsf_Namespace_AName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Sco_Math fix
+ */
+tSCC zSco_MathName[] =
+ "sco_math";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSco_MathList[] =
+ "|math.h|ansi/math.h|posix/math.h|xpg4/math.h|xpg4v2/math.h|xpg4plus/math.h|ods_30_compat/math.h|oldstyle/math.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzSco_MathMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSco_MathSelect0[] =
+ "inline double abs";
+
+#define SCO_MATH_TEST_CT 1
+static tTestDesc aSco_MathTests[] = {
+ { TT_EGREP, zSco_MathSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Sco_Math
+ */
+static const char* apzSco_MathPatch[] = { "sed",
+ "-e", "/#define.*__fp_class(a) \\\\/i\\\n\
+#ifndef __GNUC__\n",
+ "-e", "/.*__builtin_generic/a\\\n\
+#else\\\n\
+#define __fp_class(a) \\\\\\\n\
+ __builtin_choose_expr(__builtin_types_compatible_p(typeof(a),long double),\\\\\\\n\
+ __fpclassifyl(a), \\\\\\\n\
+ __builtin_choose_expr(__builtin_types_compatible_p(typeof(a), float), \\\\\\\n\
+ __fpclassifyf(a),__fpclassify(a)))\\\n\
+#endif",
+ "-e", "/extern \"C\\+\\+\"/N;/inline double abs/i\\\n\
+#ifndef __GNUC__\n",
+ "-e", "/inline long double trunc/N;/inline long double trunc.*}.*extern \"C\\+\\+\"/a\\\n\
+#endif /* ! __GNUC__ */",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Sco_Regset fix
+ */
+tSCC zSco_RegsetName[] =
+ "sco_regset";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSco_RegsetList[] =
+ "|sys/regset.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSco_RegsetMachs[] = {
+ "*-*-sco3.2v5*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSco_RegsetSelect0[] =
+ "(struct[ \t]+.*)fpstate";
+
+#define SCO_REGSET_TEST_CT 1
+static tTestDesc aSco_RegsetTests[] = {
+ { TT_EGREP, zSco_RegsetSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Sco_Regset
+ */
+static const char* apzSco_RegsetPatch[] = {
+ "format",
+ "%1rsfpstate",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Sco_Static_Func fix
*/
tSCC zSco_Static_FuncName[] =
#else\n\
%1, {0}}%3\n\
#endif",
- "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+{.*),[ \t]*0}(|[ \t].*)$",
+ "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+\\{.*),[ \t]*0\\}(|[ \t].*)$",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Socket fix
+ */
+tSCC zSolaris_SocketName[] =
+ "solaris_socket";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_SocketList[] =
+ "|sys/socket.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzSolaris_SocketMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_SocketSelect0[] =
+ "@\\(#\\)socket.h[ \t]+1.[123][0-9][ \t]+9[567]/[0-9/]+ SMI";
+
+#define SOLARIS_SOCKET_TEST_CT 1
+static tTestDesc aSolaris_SocketTests[] = {
+ { TT_EGREP, zSolaris_SocketSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Socket
+ */
+static const char* apzSolaris_SocketPatch[] = {
+ "format",
+ "extern int %1(int, %2void *, int, int);",
+ "^extern int (recv|send)\\(int, (const )*char \\*, int, int\\);",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Solaris_Unistd fix
+ */
+tSCC zSolaris_UnistdName[] =
+ "solaris_unistd";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_UnistdList[] =
+ "|unistd.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzSolaris_UnistdMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_UnistdSelect0[] =
+ "@\\(#\\)unistd.h[ \t]+1.3[0-9][ \t]+9[567]/[0-9/]+ SMI";
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_UnistdBypass0[] =
+ "getpagesize";
+
+#define SOLARIS_UNISTD_TEST_CT 2
+static tTestDesc aSolaris_UnistdTests[] = {
+ { TT_NEGREP, zSolaris_UnistdBypass0, (regex_t*)NULL },
+ { TT_EGREP, zSolaris_UnistdSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Unistd
+ */
+static const char* apzSolaris_UnistdPatch[] = {
+ "format",
+ "extern int getpagesize();\n\
+%0",
+ "^extern (pid_t|int) getpgid\\(.*\\);",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Solaris_Widec fix
*/
tSCC zSolaris_WidecName[] =
* Machine/OS name selection pattern
*/
tSCC* apzSolaris_WidecMachs[] = {
- "*-*-solaris2.[0-5]*",
+ "*-*-solaris2.[0-5]",
+ "*-*-solaris2.[0-5].*",
(const char*)NULL };
/*
* File name selection pattern
*/
tSCC zStdio_Va_ListList[] =
- "|stdio.h|";
+ "|stdio.h|internal/stdio_core.h|internal/wchar_core.h|";
/*
* Machine/OS name selection pattern
*/
* content bypass pattern - skip fix if pattern found
*/
tSCC zStdio_Va_ListBypass0[] =
- "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list";
+ "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list";
#define STDIO_VA_LIST_TEST_CT 1
static tTestDesc aStdio_Va_ListTests[] = {
static const char* apzStdio_Va_ListPatch[] = { "sed",
"-e", "s@ va_list @ __gnuc_va_list @\n\
s@ va_list)@ __gnuc_va_list)@\n\
+s@(va_list)&@(__gnuc_va_list)\\&@\n\
s@ _VA_LIST_));@ __gnuc_va_list));@\n\
s@ __VA_LIST__));@ __gnuc_va_list));@\n\
s@ va_list@ __not_va_list__@\n\
s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\
s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n\
s@GNUC_VA_LIST@GNUC_Va_LIST@\n\
+s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n\
s@_NEED___VA_LIST@_NEED___Va_LIST@\n\
s@VA_LIST@DUMMY_VA_LIST@\n\
s@_Va_LIST@_VA_LIST@",
*/
tSCC zStrict_Ansi_NotBypass0[] =
"GNU and MIPS C compilers define __STDC__ differently";
+tSCC zStrict_Ansi_NotBypass1[] =
+ "__SCO_VERSION__.*__STDC__ != 1";
/*
* perform the C function call test
*/
tSCC zStrict_Ansi_NotFTst0[] = "stdc_0_in_system_headers";
-#define STRICT_ANSI_NOT_TEST_CT 3
+#define STRICT_ANSI_NOT_TEST_CT 4
static tTestDesc aStrict_Ansi_NotTests[] = {
{ TT_FUNCTION, zStrict_Ansi_NotFTst0, 0 /* unused */ },
{ TT_NEGREP, zStrict_Ansi_NotBypass0, (regex_t*)NULL },
+ { TT_NEGREP, zStrict_Ansi_NotBypass1, (regex_t*)NULL },
{ TT_EGREP, zStrict_Ansi_NotSelect0, (regex_t*)NULL }, };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zStruct_SockaddrSelect0[] =
- "^.*authdes_create.*struct sockaddr";
+ "^.*authdes_create.*struct sockaddr[^_]";
/*
* content bypass pattern - skip fix if pattern found
*/
tSCC zStruct_SockaddrBypass0[] =
"<sys/socket.h>";
+tSCC zStruct_SockaddrBypass1[] =
+ "struct sockaddr;\n";
-#define STRUCT_SOCKADDR_TEST_CT 2
+#define STRUCT_SOCKADDR_TEST_CT 3
static tTestDesc aStruct_SockaddrTests[] = {
{ TT_NEGREP, zStruct_SockaddrBypass0, (regex_t*)NULL },
+ { TT_NEGREP, zStruct_SockaddrBypass1, (regex_t*)NULL },
{ TT_EGREP, zStruct_SockaddrSelect0, (regex_t*)NULL }, };
/*
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Svr4_Disable_Opt fix
+ */
+tSCC zSvr4_Disable_OptName[] =
+ "svr4_disable_opt";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSvr4_Disable_OptList[] =
+ "|string.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzSvr4_Disable_OptMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSvr4_Disable_OptSelect0[] =
+ "#define.*__std_hdr_";
+
+#define SVR4_DISABLE_OPT_TEST_CT 1
+static tTestDesc aSvr4_Disable_OptTests[] = {
+ { TT_EGREP, zSvr4_Disable_OptSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Svr4_Disable_Opt
+ */
+static const char* apzSvr4_Disable_OptPatch[] = { "sed",
+ "-e", "/#define.*__std_hdr_/d",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Svr4_Getcwd fix
*/
tSCC zSvr4_GetcwdName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Svr4_Krnl fix
+ */
+tSCC zSvr4_KrnlName[] =
+ "svr4_krnl";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSvr4_KrnlList[] =
+ "|fs/rfs/rf_cache.h|sys/erec.h|sys/err.h|sys/char.h|sys/getpages.h|sys/map.h|sys/cmn_err.h|sys/kdebugger.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSvr4_KrnlMachs[] = {
+ "*-*-sysv4*",
+ "i?86-sequent-ptx*",
+ (const char*)NULL };
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zSvr4_KrnlBypass0[] =
+ "_KERNEL";
+
+#define SVR4_KRNL_TEST_CT 1
+static tTestDesc aSvr4_KrnlTests[] = {
+ { TT_NEGREP, zSvr4_KrnlBypass0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Svr4_Krnl
+ */
+static const char* apzSvr4_KrnlPatch[] = {
+ "wrap",
+ "#ifdef _KERNEL\n",
+ "#endif /* _KERNEL */\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Svr4_Profil fix
*/
tSCC zSvr4_ProfilName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Svr4_Sighandler_Type fix
+ */
+tSCC zSvr4_Sighandler_TypeName[] =
+ "svr4_sighandler_type";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSvr4_Sighandler_TypeList[] =
+ "|sys/signal.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzSvr4_Sighandler_TypeMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSvr4_Sighandler_TypeSelect0[] =
+ "void *\\(\\*\\)\\(\\)";
+
+#define SVR4_SIGHANDLER_TYPE_TEST_CT 1
+static tTestDesc aSvr4_Sighandler_TypeTests[] = {
+ { TT_EGREP, zSvr4_Sighandler_TypeSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Svr4_Sighandler_Type
+ */
+static const char* apzSvr4_Sighandler_TypePatch[] = {
+ "format",
+ "void (*)(int)",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Svr4_Undeclared_Getrnge fix
+ */
+tSCC zSvr4_Undeclared_GetrngeName[] =
+ "svr4_undeclared_getrnge";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSvr4_Undeclared_GetrngeList[] =
+ "|regexp.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzSvr4_Undeclared_GetrngeMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSvr4_Undeclared_GetrngeSelect0[] =
+ "getrnge";
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zSvr4_Undeclared_GetrngeBypass0[] =
+ "static void getrnge";
+
+#define SVR4_UNDECLARED_GETRNGE_TEST_CT 2
+static tTestDesc aSvr4_Undeclared_GetrngeTests[] = {
+ { TT_NEGREP, zSvr4_Undeclared_GetrngeBypass0, (regex_t*)NULL },
+ { TT_EGREP, zSvr4_Undeclared_GetrngeSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Svr4_Undeclared_Getrnge
+ */
+static const char* apzSvr4_Undeclared_GetrngePatch[] = {
+ "format",
+ "%0\n\
+static int getrnge ();",
+ "^static int[ \t]+size;",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Sysv68_String fix
*/
tSCC zSysv68_StringName[] =
*/
static const char* apzUndefine_NullPatch[] = {
"format",
- "#ifndef NULL%2\n\
-#define NULL%1%2\n\
-#endif%2\n",
- "^#[ \t]*define[ \t]*[ \t]NULL([^\r\n\
-]+)([\r]*)\n",
+ "#ifndef NULL\n\
+#define NULL%1\n\
+#endif\n",
+ "^#[ \t]*define[ \t]+NULL([^\r\n\
+]+)[\r]*\n",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* List of all fixes
*/
-#define REGEX_COUNT 160
+#define REGEX_COUNT 181
#define MACH_LIST_SIZE_LIMIT 261
-#define FIX_COUNT 148
+#define FIX_COUNT 161
/*
* Enumerate the fixes
ALPHA_ASSERT_FIXIDX,
ALPHA_GETOPT_FIXIDX,
ALPHA_PARENS_FIXIDX,
+ ALPHA_PTHREAD_FIXIDX,
+ ALPHA_PTHREAD_GCC_FIXIDX,
ALPHA_SBRK_FIXIDX,
AVOID_BOOL_DEFINE_FIXIDX,
AVOID_BOOL_TYPE_FIXIDX,
BAD_LVAL_FIXIDX,
BAD_STRUCT_TERM_FIXIDX,
BADQUOTE_FIXIDX,
- BSD_STDIO_ATTRS_CONFLICT_FIXIDX,
BROKEN_ASSERT_STDIO_FIXIDX,
BROKEN_ASSERT_STDLIB_FIXIDX,
BROKEN_CABS_FIXIDX,
+ BSD_STDIO_ATTRS_CONFLICT_FIXIDX,
CTRL_QUOTES_DEF_FIXIDX,
CTRL_QUOTES_USE_FIXIDX,
CXX_UNREADY_FIXIDX,
HPUX11_ABS_FIXIDX,
HPUX11_FABSF_FIXIDX,
HPUX11_SIZE_T_FIXIDX,
+ HPUX11_SNPRINTF_FIXIDX,
HPUX11_UINT32_C_FIXIDX,
HPUX11_VSNPRINTF_FIXIDX,
HPUX8_BOGUS_INLINES_FIXIDX,
NEXT_VOLITILE_FIXIDX,
NEXT_WAIT_UNION_FIXIDX,
NODEENT_SYNTAX_FIXIDX,
+ OBSTACK_LVALUE_CAST_FIXIDX,
OSF_NAMESPACE_A_FIXIDX,
OSF_NAMESPACE_C_FIXIDX,
PTHREAD_PAGE_SIZE_FIXIDX,
RS6000_DOUBLE_FIXIDX,
RS6000_FCHMOD_FIXIDX,
RS6000_PARAM_FIXIDX,
+ SCO_MATH_FIXIDX,
+ SCO_REGSET_FIXIDX,
SCO_STATIC_FUNC_FIXIDX,
SCO_UTIME_FIXIDX,
SOLARIS_MUTEX_INIT_1_FIXIDX,
SOLARIS_MUTEX_INIT_2_FIXIDX,
+ SOLARIS_SOCKET_FIXIDX,
SOLARIS_STDIO_TAG_FIXIDX,
+ SOLARIS_UNISTD_FIXIDX,
SOLARIS_WIDEC_FIXIDX,
STATSSWTCH_FIXIDX,
STDIO_STDARG_H_FIXIDX,
SUNOS_MATHERR_DECL_FIXIDX,
SUNOS_STRLEN_FIXIDX,
SVR4__P_FIXIDX,
+ SVR4_DISABLE_OPT_FIXIDX,
SVR4_GETCWD_FIXIDX,
+ SVR4_KRNL_FIXIDX,
SVR4_PROFIL_FIXIDX,
+ SVR4_SIGHANDLER_TYPE_FIXIDX,
+ SVR4_UNDECLARED_GETRNGE_FIXIDX,
SYSV68_STRING_FIXIDX,
SYSZ_STDLIB_FOR_SUN_FIXIDX,
THREAD_KEYWORD_FIXIDX,
ALPHA_PARENS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAlpha_ParensTests, apzAlpha_ParensPatch, 0 },
+ { zAlpha_PthreadName, zAlpha_PthreadList,
+ apzAlpha_PthreadMachs,
+ ALPHA_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAlpha_PthreadTests, apzAlpha_PthreadPatch, 0 },
+
+ { zAlpha_Pthread_GccName, zAlpha_Pthread_GccList,
+ apzAlpha_Pthread_GccMachs,
+ ALPHA_PTHREAD_GCC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aAlpha_Pthread_GccTests, apzAlpha_Pthread_GccPatch, 0 },
+
{ zAlpha_SbrkName, zAlpha_SbrkList,
apzAlpha_SbrkMachs,
ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
BADQUOTE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aBadquoteTests, apzBadquotePatch, 0 },
- { zBsd_Stdio_Attrs_ConflictName, zBsd_Stdio_Attrs_ConflictList,
- apzBsd_Stdio_Attrs_ConflictMachs,
- BSD_STDIO_ATTRS_CONFLICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aBsd_Stdio_Attrs_ConflictTests, apzBsd_Stdio_Attrs_ConflictPatch, 0 },
-
{ zBroken_Assert_StdioName, zBroken_Assert_StdioList,
apzBroken_Assert_StdioMachs,
BROKEN_ASSERT_STDIO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
BROKEN_CABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aBroken_CabsTests, apzBroken_CabsPatch, 0 },
+ { zBsd_Stdio_Attrs_ConflictName, zBsd_Stdio_Attrs_ConflictList,
+ apzBsd_Stdio_Attrs_ConflictMachs,
+ BSD_STDIO_ATTRS_CONFLICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aBsd_Stdio_Attrs_ConflictTests, apzBsd_Stdio_Attrs_ConflictPatch, 0 },
+
{ zCtrl_Quotes_DefName, zCtrl_Quotes_DefList,
apzCtrl_Quotes_DefMachs,
CTRL_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
HPUX11_SIZE_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux11_Size_TTests, apzHpux11_Size_TPatch, 0 },
+ { zHpux11_SnprintfName, zHpux11_SnprintfList,
+ apzHpux11_SnprintfMachs,
+ HPUX11_SNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux11_SnprintfTests, apzHpux11_SnprintfPatch, 0 },
+
{ zHpux11_Uint32_CName, zHpux11_Uint32_CList,
apzHpux11_Uint32_CMachs,
HPUX11_UINT32_C_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
NODEENT_SYNTAX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aNodeent_SyntaxTests, apzNodeent_SyntaxPatch, 0 },
+ { zObstack_Lvalue_CastName, zObstack_Lvalue_CastList,
+ apzObstack_Lvalue_CastMachs,
+ OBSTACK_LVALUE_CAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aObstack_Lvalue_CastTests, apzObstack_Lvalue_CastPatch, 0 },
+
{ zOsf_Namespace_AName, zOsf_Namespace_AList,
apzOsf_Namespace_AMachs,
OSF_NAMESPACE_A_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
RS6000_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aRs6000_ParamTests, apzRs6000_ParamPatch, 0 },
+ { zSco_MathName, zSco_MathList,
+ apzSco_MathMachs,
+ SCO_MATH_TEST_CT, FD_MACH_ONLY,
+ aSco_MathTests, apzSco_MathPatch, 0 },
+
+ { zSco_RegsetName, zSco_RegsetList,
+ apzSco_RegsetMachs,
+ SCO_REGSET_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSco_RegsetTests, apzSco_RegsetPatch, 0 },
+
{ zSco_Static_FuncName, zSco_Static_FuncList,
apzSco_Static_FuncMachs,
SCO_STATIC_FUNC_TEST_CT, FD_MACH_ONLY,
SOLARIS_MUTEX_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aSolaris_Mutex_Init_2Tests, apzSolaris_Mutex_Init_2Patch, 0 },
+ { zSolaris_SocketName, zSolaris_SocketList,
+ apzSolaris_SocketMachs,
+ SOLARIS_SOCKET_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_SocketTests, apzSolaris_SocketPatch, 0 },
+
{ zSolaris_Stdio_TagName, zSolaris_Stdio_TagList,
apzSolaris_Stdio_TagMachs,
SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,
aSolaris_Stdio_TagTests, apzSolaris_Stdio_TagPatch, 0 },
+ { zSolaris_UnistdName, zSolaris_UnistdList,
+ apzSolaris_UnistdMachs,
+ SOLARIS_UNISTD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_UnistdTests, apzSolaris_UnistdPatch, 0 },
+
{ zSolaris_WidecName, zSolaris_WidecList,
apzSolaris_WidecMachs,
SOLARIS_WIDEC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
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,
+ aSvr4_Disable_OptTests, apzSvr4_Disable_OptPatch, 0 },
+
{ zSvr4_GetcwdName, zSvr4_GetcwdList,
apzSvr4_GetcwdMachs,
SVR4_GETCWD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aSvr4_GetcwdTests, apzSvr4_GetcwdPatch, 0 },
+ { zSvr4_KrnlName, zSvr4_KrnlList,
+ apzSvr4_KrnlMachs,
+ SVR4_KRNL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSvr4_KrnlTests, apzSvr4_KrnlPatch, 0 },
+
{ zSvr4_ProfilName, zSvr4_ProfilList,
apzSvr4_ProfilMachs,
SVR4_PROFIL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aSvr4_ProfilTests, apzSvr4_ProfilPatch, 0 },
+ { zSvr4_Sighandler_TypeName, zSvr4_Sighandler_TypeList,
+ apzSvr4_Sighandler_TypeMachs,
+ SVR4_SIGHANDLER_TYPE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSvr4_Sighandler_TypeTests, apzSvr4_Sighandler_TypePatch, 0 },
+
+ { zSvr4_Undeclared_GetrngeName, zSvr4_Undeclared_GetrngeList,
+ apzSvr4_Undeclared_GetrngeMachs,
+ SVR4_UNDECLARED_GETRNGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSvr4_Undeclared_GetrngeTests, apzSvr4_Undeclared_GetrngePatch, 0 },
+
{ zSysv68_StringName, zSysv68_StringList,
apzSysv68_StringMachs,
SYSV68_STRING_TEST_CT, FD_MACH_ONLY,
OSDN Git Service
