* files which are fixed to work correctly with ANSI C and placed in a
* directory that GNU C will search.
*
- * This file contains 139 fixup descriptions.
+ * This file contains 147 fixup descriptions.
*
* See README for more information.
*
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Aab_Solaris_Sys_Varargs_H fix
+ */
+tSCC zAab_Solaris_Sys_Varargs_HName[] =
+ "AAB_solaris_sys_varargs_h";
+
+/*
+ * File name selection pattern
+ */
+tSCC zAab_Solaris_Sys_Varargs_HList[] =
+ "|sys/varargs.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzAab_Solaris_Sys_Varargs_HMachs[] = {
+ "*-*-solaris*",
+ (const char*)NULL };
+#define AAB_SOLARIS_SYS_VARARGS_H_TEST_CT 0
+#define aAab_Solaris_Sys_Varargs_HTests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Aab_Solaris_Sys_Varargs_H
+ */
+static const char* apzAab_Solaris_Sys_Varargs_HPatch[] = {
+"#ifdef __STDC__\n\
+#include <stdarg.h>\n\
+#else\n\
+#include <varargs.h>\n\
+#endif\n",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Aab_Sun_Memcpy fix
*/
tSCC zAab_Sun_MemcpyName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Hpux11_Abs fix
+ */
+tSCC zHpux11_AbsName[] =
+ "hpux11_abs";
+
+/*
+ * File name selection pattern
+ */
+tSCC zHpux11_AbsList[] =
+ "|stdlib.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzHpux11_AbsMachs[] = {
+ "ia64-hp-hpux11*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_AbsSelect0[] =
+ "ifndef _MATH_INCLUDED";
+
+#define HPUX11_ABS_TEST_CT 1
+static tTestDesc aHpux11_AbsTests[] = {
+ { TT_EGREP, zHpux11_AbsSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Hpux11_Abs
+ */
+static const char* apzHpux11_AbsPatch[] = {
+ "format",
+ "if !defined(_MATH_INCLUDED) || defined(__GNUG__)",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Hpux11_Size_T fix
*/
tSCC zHpux11_Size_TName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Solaris_Stdio_Tag fix
+ */
+tSCC zSolaris_Stdio_TagName[] =
+ "solaris_stdio_tag";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_Stdio_TagList[] =
+ "|stdio_tag.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzSolaris_Stdio_TagMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Stdio_TagSelect0[] =
+ "__cplusplus < 54321L";
+
+#define SOLARIS_STDIO_TAG_TEST_CT 1
+static tTestDesc aSolaris_Stdio_TagTests[] = {
+ { TT_EGREP, zSolaris_Stdio_TagSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Stdio_Tag
+ */
+static const char* apzSolaris_Stdio_TagPatch[] = { "sed",
+ "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Solaris_Widec fix
+ */
+tSCC zSolaris_WidecName[] =
+ "solaris_widec";
+
+/*
+ * File name selection pattern
+ */
+tSCC zSolaris_WidecList[] =
+ "|widec.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_WidecMachs[] = {
+ "*-*-solaris2.[0-5]*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_WidecSelect0[] =
+ "#include <euc.h>";
+
+/*
+ * content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_WidecBypass0[] =
+ "include.*wchar\\.h";
+
+#define SOLARIS_WIDEC_TEST_CT 2
+static tTestDesc aSolaris_WidecTests[] = {
+ { TT_NEGREP, zSolaris_WidecBypass0, (regex_t*)NULL },
+ { TT_EGREP, zSolaris_WidecSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Solaris_Widec
+ */
+static const char* apzSolaris_WidecPatch[] = {
+ "format",
+ "%0\n\
+#include <wchar.h>",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Statsswtch fix
*/
tSCC zStatsswtchName[] =
s@\\*va_list@*__not_va_list__@\n\
s@ __va_list)@ __gnuc_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@_NEED___VA_LIST@_NEED___Va_LIST@\n\
s@VA_LIST@DUMMY_VA_LIST@\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Thread_Keyword fix
+ */
+tSCC zThread_KeywordName[] =
+ "thread_keyword";
+
+/*
+ * File name selection pattern
+ */
+tSCC zThread_KeywordList[] =
+ "|pthread.h|bits/sigthread.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzThread_KeywordMachs (const char**)NULL
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zThread_KeywordSelect0[] =
+ "([* ])__thread([,)])";
+
+#define THREAD_KEYWORD_TEST_CT 1
+static tTestDesc aThread_KeywordTests[] = {
+ { TT_EGREP, zThread_KeywordSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Thread_Keyword
+ */
+static const char* apzThread_KeywordPatch[] = {
+ "format",
+ "%1__thr%2",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Tinfo_Cplusplus fix
*/
tSCC zTinfo_CplusplusName[] =
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Windiss_Math1 fix
+ */
+tSCC zWindiss_Math1Name[] =
+ "windiss_math1";
+
+/*
+ * File name selection pattern
+ */
+tSCC zWindiss_Math1List[] =
+ "|math.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzWindiss_Math1Machs[] = {
+ "*-*-windiss",
+ (const char*)NULL };
+#define WINDISS_MATH1_TEST_CT 0
+#define aWindiss_Math1Tests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Windiss_Math1
+ */
+static const char* apzWindiss_Math1Patch[] = { "sed",
+ "-e", "s|inline long double cosl.*|#ifndef __GNUC__|",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Windiss_Math2 fix
+ */
+tSCC zWindiss_Math2Name[] =
+ "windiss_math2";
+
+/*
+ * File name selection pattern
+ */
+tSCC zWindiss_Math2List[] =
+ "|math.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzWindiss_Math2Machs[] = {
+ "*-*-windiss",
+ (const char*)NULL };
+#define WINDISS_MATH2_TEST_CT 0
+#define aWindiss_Math2Tests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Windiss_Math2
+ */
+static const char* apzWindiss_Math2Patch[] = { "sed",
+ "-e", "s|/\\* long double declarations \\*/|#endif /* __GNUC__ */|",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Windiss_Valist fix
+ */
+tSCC zWindiss_ValistName[] =
+ "windiss_valist";
+
+/*
+ * File name selection pattern
+ */
+#define zWindiss_ValistList (char*)NULL
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzWindiss_ValistMachs[] = {
+ "*-*-windiss",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zWindiss_ValistSelect0[] =
+ "(#include.*)diab/va_list.h";
+
+#define WINDISS_VALIST_TEST_CT 1
+static tTestDesc aWindiss_ValistTests[] = {
+ { TT_EGREP, zWindiss_ValistSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Windiss_Valist
+ */
+static const char* apzWindiss_ValistPatch[] = { "sed",
+ "-e", "s|diab/va_list.h|stdarg.h|",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of X11_Class fix
*/
tSCC zX11_ClassName[] =
*
* List of all fixes
*/
-#define REGEX_COUNT 148
+#define REGEX_COUNT 154
#define MACH_LIST_SIZE_LIMIT 279
-#define FIX_COUNT 139
+#define FIX_COUNT 147
/*
* Enumerate the fixes
AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX,
AAB_FD_ZERO_GNU_TYPES_H_FIXIDX,
AAB_FD_ZERO_SELECTBITS_H_FIXIDX,
+ AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
AAB_SUN_MEMCPY_FIXIDX,
AAB_SVR4_REPLACE_BYTEORDER_FIXIDX,
AAB_ULTRIX_ANSI_COMPAT_FIXIDX,
HPUX10_CPP_POW_INLINE_FIXIDX,
HPUX11_CPP_POW_INLINE_FIXIDX,
HPUX11_FABSF_FIXIDX,
+ HPUX11_ABS_FIXIDX,
HPUX11_SIZE_T_FIXIDX,
HPUX11_UINT32_C_FIXIDX,
HPUX11_VSNPRINTF_FIXIDX,
SCO_STATIC_FUNC_FIXIDX,
SCO_UTIME_FIXIDX,
SOLARIS_MUTEX_INIT_FIXIDX,
+ SOLARIS_STDIO_TAG_FIXIDX,
+ SOLARIS_WIDEC_FIXIDX,
STATSSWTCH_FIXIDX,
STDIO_STDARG_H_FIXIDX,
STDIO_VA_LIST_FIXIDX,
SVR4_PROFIL_FIXIDX,
SYSV68_STRING_FIXIDX,
SYSZ_STDLIB_FOR_SUN_FIXIDX,
+ THREAD_KEYWORD_FIXIDX,
TINFO_CPLUSPLUS_FIXIDX,
ULTRIX_ATEXIT_PARAM_FIXIDX,
ULTRIX_ATOF_PARAM_FIXIDX,
VXWORKS_NEEDS_VXTYPES_FIXIDX,
VXWORKS_NEEDS_VXWORKS_FIXIDX,
VXWORKS_TIME_FIXIDX,
+ WINDISS_MATH1_FIXIDX,
+ WINDISS_MATH2_FIXIDX,
+ WINDISS_VALIST_FIXIDX,
X11_CLASS_FIXIDX,
X11_CLASS_USAGE_FIXIDX,
X11_NEW_FIXIDX,
AAB_FD_ZERO_SELECTBITS_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
aAab_Fd_Zero_Selectbits_HTests, apzAab_Fd_Zero_Selectbits_HPatch, 0 },
+ { zAab_Solaris_Sys_Varargs_HName, zAab_Solaris_Sys_Varargs_HList,
+ apzAab_Solaris_Sys_Varargs_HMachs,
+ AAB_SOLARIS_SYS_VARARGS_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+ aAab_Solaris_Sys_Varargs_HTests, apzAab_Solaris_Sys_Varargs_HPatch, 0 },
+
{ zAab_Sun_MemcpyName, zAab_Sun_MemcpyList,
apzAab_Sun_MemcpyMachs,
AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux11_FabsfTests, apzHpux11_FabsfPatch, 0 },
+ { zHpux11_AbsName, zHpux11_AbsList,
+ apzHpux11_AbsMachs,
+ HPUX11_ABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aHpux11_AbsTests, apzHpux11_AbsPatch, 0 },
+
{ zHpux11_Size_TName, zHpux11_Size_TList,
apzHpux11_Size_TMachs,
HPUX11_SIZE_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
SOLARIS_MUTEX_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aSolaris_Mutex_InitTests, apzSolaris_Mutex_InitPatch, 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_WidecName, zSolaris_WidecList,
+ apzSolaris_WidecMachs,
+ SOLARIS_WIDEC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aSolaris_WidecTests, apzSolaris_WidecPatch, 0 },
+
{ zStatsswtchName, zStatsswtchList,
apzStatsswtchMachs,
STATSSWTCH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
SYSZ_STDLIB_FOR_SUN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aSysz_Stdlib_For_SunTests, apzSysz_Stdlib_For_SunPatch, 0 },
+ { zThread_KeywordName, zThread_KeywordList,
+ apzThread_KeywordMachs,
+ THREAD_KEYWORD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aThread_KeywordTests, apzThread_KeywordPatch, 0 },
+
{ zTinfo_CplusplusName, zTinfo_CplusplusList,
apzTinfo_CplusplusMachs,
TINFO_CPLUSPLUS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
VXWORKS_TIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aVxworks_TimeTests, apzVxworks_TimePatch, 0 },
+ { zWindiss_Math1Name, zWindiss_Math1List,
+ apzWindiss_Math1Machs,
+ WINDISS_MATH1_TEST_CT, FD_MACH_ONLY,
+ aWindiss_Math1Tests, apzWindiss_Math1Patch, 0 },
+
+ { zWindiss_Math2Name, zWindiss_Math2List,
+ apzWindiss_Math2Machs,
+ WINDISS_MATH2_TEST_CT, FD_MACH_ONLY,
+ aWindiss_Math2Tests, apzWindiss_Math2Patch, 0 },
+
+ { zWindiss_ValistName, zWindiss_ValistList,
+ apzWindiss_ValistMachs,
+ WINDISS_VALIST_TEST_CT, FD_MACH_ONLY,
+ aWindiss_ValistTests, apzWindiss_ValistPatch, 0 },
+
{ zX11_ClassName, zX11_ClassList,
apzX11_ClassMachs,
X11_CLASS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
OSDN Git Service
