X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=fixincludes%2Ffixincl.x;h=f91bb3a1ca51d891425494a0a31bc7186b51f21e;hb=f55ef56056c10f36bf1d0094c0e14921c59b116f;hp=3be69a6b4dc771465ed3fcadd1a4b51fb744a5f3;hpb=661832db7086a227979240980f1cdc10376c0dd4;p=pf3gnuchains%2Fgcc-fork.git diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 3be69a6b4dc..f91bb3a1ca5 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 Monday January 7, 2008 at 09:24:53 PM CET + * It has been AutoGen-ed Sunday June 8, 2008 at 09:19:13 AM PDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Jan 7 21:24:53 CET 2008 +/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jun 8 09:19:13 PDT 2008 * * You must regenerate it. Use the ./genfixes script. * @@ -15,31 +15,85 @@ * 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 211 fixup descriptions. + * This file contains 177 fixup descriptions. * * See README for more information. * - * inclhack copyright (c) 1998, 1999, 2000, 2001 + * inclhack copyright (c) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + * 2006, 2007, 2008 * The Free Software Foundation, Inc. * - * inclhack is free software. + * inclhack is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * You may redistribute it and/or modify it under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * inclhack is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * inclhack is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with inclhack. If not, write to: - * The Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aab_Aix_Stdio fix + */ +tSCC zAab_Aix_StdioName[] = + "AAB_aix_stdio"; + +/* + * File name selection pattern + */ +tSCC zAab_Aix_StdioList[] = + "stdio.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAab_Aix_StdioMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAab_Aix_StdioSelect0[] = + "define fopen fopen64"; + +#define AAB_AIX_STDIO_TEST_CT 1 +static tTestDesc aAab_Aix_StdioTests[] = { + { TT_EGREP, zAab_Aix_StdioSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aab_Aix_Stdio */ +static const char* apzAab_Aix_StdioPatch[] = { + "wrap", + "", + "\n\ +#if defined __GNUG__ && defined _LARGE_FILES && defined __cplusplus\n\ +#define __need__aix_stdio_h_fix\n\ +#ifdef __need__aix_stdio_h_fix\n\ +#undef fseeko\n\ +#undef ftello\n\ +#undef fgetpos\n\ +#undef fsetpos\n\ +#undef fopen\n\ +#undef freopen\n\ +/* Alias the symbols using asm */\n\ +extern \"C\" {\n\ +extern int fgetpos(FILE *, fpos64_t *) __asm__(\"fgetpos64\");\n\ +extern FILE *fopen(const char *, const char *) __asm__(\"fopen64\");\n\ +extern FILE *freopen(const char *, const char *, FILE *) __asm__(\"freopen64\");\n\ +extern int fseeko(FILE *, off64_t, int) __asm__(\"fseeko64\");\n\ +extern int fsetpos(FILE *, const fpos64_t *) __asm__(\"fsetpos64\");\n\ +extern off64_t ftello(FILE *) __asm__(\"ftello64\");\n\ +}\n\ +#endif\n\ +#endif\n", + (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -219,11 +273,14 @@ tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass0[] = "} while"; tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass1[] = "x86_64"; +tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass2[] = + "posix_types_64"; -#define AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT 2 +#define AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT 3 static tTestDesc aAab_Fd_Zero_Asm_Posix_Types_HTests[] = { { TT_NEGREP, zAab_Fd_Zero_Asm_Posix_Types_HBypass0, (regex_t*)NULL }, - { TT_NEGREP, zAab_Fd_Zero_Asm_Posix_Types_HBypass1, (regex_t*)NULL }, }; + { TT_NEGREP, zAab_Fd_Zero_Asm_Posix_Types_HBypass1, (regex_t*)NULL }, + { TT_NEGREP, zAab_Fd_Zero_Asm_Posix_Types_HBypass2, (regex_t*)NULL }, }; /* * Fix Command Arguments for Aab_Fd_Zero_Asm_Posix_Types_H @@ -419,277 +476,7 @@ static const char* apzAab_Sun_MemcpyPatch[] = { extern char *memset();\n\ #endif /* __STDC__ */\n\n\ extern int memcmp();\n\n\ -#endif /* __memory_h__ */\n\ -_EndOfHeader;\n\ -};\n\n\n\ -/*\n\ - * Completely replace with a file that includes gcc's\n\ - * stdarg.h or varargs.h files as appropriate.\n\ - */\n\ -#ifdef SVR4\n\ -fix = {\n\ - hackname = AAB_svr4_no_varargs;\n\ - 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\ - \"#ifdef __STDC__\\n\"\n\ - \"#include \\n\"\n\ - \"#else\\n\"\n\ - \"#include \\n\"\n\ - \"#endif\\n\\n\"\n\n\ - \"#endif /* _SYS_VARARGS_H */\\n\";\n\ -};\n\ -#endif\n\n\n\ -/*\n\ - * Completely replace 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\ - 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\ - mach = \"i[34567]86-sequent-ptx*\";\n\ - files = sys/byteorder.h;\n\ - replace = <<- _EndOfHeader_\n\ -#ifndef _SYS_BYTEORDER_H\n\ -#define _SYS_BYTEORDER_H\n\n\ -/* Functions to convert `short' and `long' quantities from host byte order\n\ - to (internet) network byte order (i.e. big-endian).\n\n\ - Written by Ron Guilmette (rfg@ncd.com).\n\n\ - This isn't actually used by GCC. It is installed by fixinc.svr4.\n\n\ - For big-endian machines these functions are essentially no-ops.\n\n\ - For little-endian machines, we define the functions using specialized\n\ - asm sequences in cases where doing so yields better code (e.g. i386). */\n\n\ -#if !defined (__GNUC__) && !defined (__GNUG__)\n\ - #error You lose! This file is only useful with GNU compilers.\n\ -#endif\n\n\ -#ifndef __BYTE_ORDER__\n\ - /* Byte order defines. These are as defined on UnixWare 1.1, but with\n\ - double underscores added at the front and back. */\n\ - #define __LITTLE_ENDIAN__ 1234\n\ - #define __BIG_ENDIAN__ 4321\n\ - #define __PDP_ENDIAN__ 3412\n\ -#endif\n\n\ -#ifdef __STDC__\n\ - static __inline__ unsigned long htonl (unsigned long);\n\ - static __inline__ unsigned short htons (unsigned int);\n\ - static __inline__ unsigned long ntohl (unsigned long);\n\ - static __inline__ unsigned short ntohs (unsigned int);\n\ -#endif /* defined (__STDC__) */\n\n\ -#if defined (__i386__)\n\n\ - #ifndef __BYTE_ORDER__\n\ - #define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\ - #endif\n\n\ - /* Convert a host long to a network long. */\n\n\ - /* We must use a new-style function definition, so that this will also\n\ - be valid for C++. */\n\ - static __inline__ unsigned long\n\ - htonl (unsigned long __arg)\n\ - {\n\ - register unsigned long __result;\n\n\ - __asm__ (\"xchg%B0 %b0,%h0\n\ - ror%L0 $16,%0\n\ - xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\ - return __result;\n\ - }\n\n\ - /* Convert a host short to a network short. */\n\n\ - static __inline__ unsigned short\n\ - htons (unsigned int __arg)\n\ - {\n\ - register unsigned short __result;\n\n\ - __asm__ (\"xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\ - return __result;\n\ - }\n\n\ -#elif (defined (__ns32k__) || defined (__vax__) || defined (__arm__))\n\n\ - #ifndef __BYTE_ORDER__\n\ - #define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\ - #endif\n\n\ - /* For other little-endian machines, using C code is just as efficient as\n\ - using assembly code. */\n\n\ - /* Convert a host long to a network long. */\n\n\ - static __inline__ unsigned long\n\ - htonl (unsigned long __arg)\n\ - {\n\ - register unsigned long __result;\n\n\ - __result = (__arg >> 24) & 0x000000ff;\n\ - __result |= (__arg >> 8) & 0x0000ff00;\n\ - __result |= (__arg << 8) & 0x00ff0000;\n\ - __result |= (__arg << 24) & 0xff000000;\n\ - return __result;\n\ - }\n\n\ - /* Convert a host short to a network short. */\n\n\ - static __inline__ unsigned short\n\ - htons (unsigned int __arg)\n\ - {\n\ - register unsigned short __result;\n\n\ - __result = (__arg << 8) & 0xff00;\n\ - __result |= (__arg >> 8) & 0x00ff;\n\ - return __result;\n\ - }\n\n\ -#else /* must be a big-endian machine */\n\n\ - #ifndef __BYTE_ORDER__\n\ - #define __BYTE_ORDER__ __BIG_ENDIAN__\n\ - #endif\n\n\ - /* Convert a host long to a network long. */\n\n\ - static __inline__ unsigned long\n\ - htonl (unsigned long __arg)\n\ - {\n\ - return __arg;\n\ - }\n\n\ - /* Convert a host short to a network short. */\n\n\ - static __inline__ unsigned short\n\ - htons (unsigned int __arg)\n\ - {\n\ - return __arg;\n\ - }\n\n\ -#endif /* big-endian */\n\n\ -/* Convert a network long to a host long. */\n\n\ -static __inline__ unsigned long\n\ -ntohl (unsigned long __arg)\n\ -{\n\ - return htonl (__arg);\n\ -}\n\n\ -/* Convert a network short to a host short. */\n\n\ -static __inline__ unsigned short\n\ -ntohs (unsigned int __arg)\n\ -{\n\ - return htons (__arg);\n\ -}\n\ -#endif", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Aab_Ultrix_Ansi_Compat fix - */ -tSCC zAab_Ultrix_Ansi_CompatName[] = - "AAB_ultrix_ansi_compat"; - -/* - * File name selection pattern - */ -tSCC zAab_Ultrix_Ansi_CompatList[] = - "ansi_compat.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzAab_Ultrix_Ansi_CompatMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAab_Ultrix_Ansi_CompatSelect0[] = - "ULTRIX"; - -#define AAB_ULTRIX_ANSI_COMPAT_TEST_CT 1 -static tTestDesc aAab_Ultrix_Ansi_CompatTests[] = { - { TT_EGREP, zAab_Ultrix_Ansi_CompatSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Aab_Ultrix_Ansi_Compat - */ -static const char* apzAab_Ultrix_Ansi_CompatPatch[] = { -"/* This file intentionally left blank. */\n", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Aab_Ultrix_Limits fix - */ -tSCC zAab_Ultrix_LimitsName[] = - "AAB_ultrix_limits"; - -/* - * File name selection pattern - */ -tSCC zAab_Ultrix_LimitsList[] = - "limits.h\0"; -/* - * 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 - */ -static const char* apzAab_Ultrix_LimitsPatch[] = { -"#ifndef _LIMITS_INCLUDED\n\ - #define _LIMITS_INCLUDED\n\ - #include \n\ -#endif /* _LIMITS_INCLUDED */", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Aab_Ultrix_Memory fix - */ -tSCC zAab_Ultrix_MemoryName[] = - "AAB_ultrix_memory"; - -/* - * File name selection pattern - */ -tSCC zAab_Ultrix_MemoryList[] = - "memory.h\0"; -/* - * 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 - */ -static const char* apzAab_Ultrix_MemoryPatch[] = { -"#ifndef _MEMORY_INCLUDED\n\ - #define _MEMORY_INCLUDED\n\ - #include \n\ -#endif /* _MEMORY_INCLUDED */", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Aab_Ultrix_String fix - */ -tSCC zAab_Ultrix_StringName[] = - "AAB_ultrix_string"; - -/* - * File name selection pattern - */ -tSCC zAab_Ultrix_StringList[] = - "string.h\0"; -/* - * 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 - */ -static const char* apzAab_Ultrix_StringPatch[] = { -"#ifndef _STRING_INCLUDED\n\ - #define _STRING_INCLUDED\n\ - #include \n\ -#endif /* _STRING_INCLUDED */", +#endif /* __memory_h__ */", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -4253,91 +4040,6 @@ static const char* apzKandr_ConcatPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Libc1_G_Va_List fix - */ -tSCC zLibc1_G_Va_ListName[] = - "libc1_G_va_list"; - -/* - * File name selection pattern - */ -tSCC zLibc1_G_Va_ListList[] = - "_G_config.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzLibc1_G_Va_ListMachs[] = { - "*-*-linux*libc1", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zLibc1_G_Va_ListSelect0[] = - "typedef void \\* _G_va_list;"; - -#define LIBC1_G_VA_LIST_TEST_CT 1 -static tTestDesc aLibc1_G_Va_ListTests[] = { - { TT_EGREP, zLibc1_G_Va_ListSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Libc1_G_Va_List - */ -static const char* apzLibc1_G_Va_ListPatch[] = { - "format", - "typedef __builtin_va_list _G_va_list;", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Libc1_Ifdefd_Memx fix - */ -tSCC zLibc1_Ifdefd_MemxName[] = - "libc1_ifdefd_memx"; - -/* - * File name selection pattern - */ -tSCC zLibc1_Ifdefd_MemxList[] = - "testing.h\0string.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzLibc1_Ifdefd_MemxMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zLibc1_Ifdefd_MemxSelect0[] = - "' is a built-in function for gcc 2\\.x\\. \\*/"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zLibc1_Ifdefd_MemxBypass0[] = - "__cplusplus"; - -#define LIBC1_IFDEFD_MEMX_TEST_CT 2 -static tTestDesc aLibc1_Ifdefd_MemxTests[] = { - { TT_NEGREP, zLibc1_Ifdefd_MemxBypass0, (regex_t*)NULL }, - { TT_EGREP, zLibc1_Ifdefd_MemxSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Libc1_Ifdefd_Memx - */ -static const char* apzLibc1_Ifdefd_MemxPatch[] = { - "format", - "%1", - "/\\* `mem...' is a built-in function for gcc 2\\.x\\. \\*/\n\ -#if defined\\(__STDC__\\) && __GNUC__ < 2\n\ -(/\\* .* \\*/\n\ -extern [a-z_]+ mem.*(\n\ -[^#].*)*;)\n\ -#endif", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Linux_Ia64_Ucontext fix */ tSCC zLinux_Ia64_UcontextName[] = @@ -4657,43 +4359,6 @@ static const char* apzNested_Auth_DesPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Nested_Motorola fix - */ -tSCC zNested_MotorolaName[] = - "nested_motorola"; - -/* - * File name selection pattern - */ -tSCC zNested_MotorolaList[] = - "sys/limits.h\0limits.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzNested_MotorolaMachs[] = { - "m68k-motorola-sysv*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zNested_MotorolaSelect0[] = - "max # bytes atomic in write|error value returned by Math lib"; - -#define NESTED_MOTOROLA_TEST_CT 1 -static tTestDesc aNested_MotorolaTests[] = { - { TT_EGREP, zNested_MotorolaSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Nested_Motorola - */ -static const char* apzNested_MotorolaPatch[] = { "sed", - "-e", "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*/\\* max # bytes atomic in write to a\\)$@\\1 */@", - "-e", "s@\\(/\\*#define\tHUGE_VAL\t3.[0-9e+]* \\)\\(/\\*error value returned by Math lib\\*/\\)$@\\1*/ \\2@", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Nested_Sys_Limits fix */ tSCC zNested_Sys_LimitsName[] = @@ -5502,123 +5167,6 @@ static const char* apzSco_MathPatch[] = { "sed", /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sco_Regset fix - */ -tSCC zSco_RegsetName[] = - "sco_regset"; - -/* - * File name selection pattern - */ -tSCC zSco_RegsetList[] = - "sys/regset.h\0"; -/* - * 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[] = - "sco_static_func"; - -/* - * File name selection pattern - */ -tSCC zSco_Static_FuncList[] = - "sys/stat.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzSco_Static_FuncMachs[] = { - "i?86-*-sco3.2*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSco_Static_FuncSelect0[] = - "^static int"; - -#define SCO_STATIC_FUNC_TEST_CT 1 -static tTestDesc aSco_Static_FuncTests[] = { - { TT_EGREP, zSco_Static_FuncSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Sco_Static_Func - */ -static const char* apzSco_Static_FuncPatch[] = { "sed", - "-e", "/^static int/i\\\n\ -#if __cplusplus\\\n\ -extern \"C\" {\\\n\ -#endif /* __cplusplus */", - "-e", "/^}$/a\\\n\ -#if __cplusplus\\\n\ - }\\\n\ -#endif /* __cplusplus */", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Sco_Utime fix - */ -tSCC zSco_UtimeName[] = - "sco_utime"; - -/* - * File name selection pattern - */ -tSCC zSco_UtimeList[] = - "sys/times.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzSco_UtimeMachs[] = { - "i?86-*-sco3.2v4*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSco_UtimeSelect0[] = - "\\(const char \\*, struct utimbuf \\*\\);"; - -#define SCO_UTIME_TEST_CT 1 -static tTestDesc aSco_UtimeTests[] = { - { TT_EGREP, zSco_UtimeSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Sco_Utime - */ -static const char* apzSco_UtimePatch[] = { - "format", - "(const char *, const struct utimbuf *);", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Solaris_Math_1 fix */ tSCC zSolaris_Math_1Name[] = @@ -5786,16 +5334,7 @@ static tTestDesc aSolaris_Math_4Tests[] = { static const char* apzSolaris_Math_4Patch[] = { "format", "#define\tfpclassify(x) \\\n\ - __extension__ ({ const __typeof(x) __x_fp = (x); \\\n\ -\t\t isnan(__x_fp) \\\n\ -\t\t ? FP_NAN \\\n\ -\t\t : isinf(__x_fp) \\\n\ -\t\t ? FP_INFINITE \\\n\ -\t\t : isnormal(__x_fp) \\\n\ -\t\t\t ? FP_NORMAL \\\n\ -\t\t\t : __x_fp == 0.0 \\\n\ -\t\t\t ? FP_ZERO \\\n\ -\t\t\t : FP_SUBNORMAL; })", + __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL, FP_SUBNORMAL, FP_ZERO, (x))", "^#define[ \t]+fpclassify\\(x\\)[ \t]+__builtin_fpclassify\\(x\\)", (char*)NULL }; @@ -5891,37 +5430,41 @@ static const char* apzSolaris_Math_9Patch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Mutex_Init_1 fix + * Description of Solaris_Math_10 fix */ -tSCC zSolaris_Mutex_Init_1Name[] = - "solaris_mutex_init_1"; +tSCC zSolaris_Math_10Name[] = + "solaris_math_10"; /* * File name selection pattern */ -tSCC zSolaris_Mutex_Init_1List[] = - "pthread.h\0"; +tSCC zSolaris_Math_10List[] = + "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Mutex_Init_1Machs (const char**)NULL +#define apzSolaris_Math_10Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSolaris_Mutex_Init_1Select0[] = - "@\\(#\\)pthread.h[ \t]+1.1[0-9][ \t]+9[567]/[0-9/]+ SMI"; +tSCC zSolaris_Math_10Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; -#define SOLARIS_MUTEX_INIT_1_TEST_CT 1 -static tTestDesc aSolaris_Mutex_Init_1Tests[] = { - { TT_EGREP, zSolaris_Mutex_Init_1Select0, (regex_t*)NULL }, }; +#define SOLARIS_MATH_10_TEST_CT 1 +static tTestDesc aSolaris_Math_10Tests[] = { + { TT_EGREP, zSolaris_Math_10Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Mutex_Init_1 + * Fix Command Arguments for Solaris_Math_10 */ -static const char* apzSolaris_Mutex_Init_1Patch[] = { "sed", - "-e", "/define[ \t]*PTHREAD_MUTEX_INI/s/{0, 0,/{{{0}, 0}, {{{0}}},/\n\ -/define[ \t]*PTHREAD_COND_INI/s/{0,/{{{0},0},/", +static const char* apzSolaris_Math_10Patch[] = { + "format", + "#define\tisinf(x) __builtin_isinf(x)", + "^#define[ \t]+isinf\\(x\\)[ \t]+__extension__\\([ \t]*\\\\\n\ +[ \t]*\\{[ \t]*__typeof\\(x\\)[ \t]*__x_i[ \t]*=[ \t]*\\(x\\);[ \t]*\\\\\n\ +[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*INFINITY[ \t]*\\|\\|[ \t]*\\\\\n\ +[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*\\(-INFINITY\\);[ \t]*\\}\\)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -6093,62 +5636,26 @@ static const char* apzSolaris_Once_Init_2Patch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Socket fix + * Description of Solaris_Stdio_Tag fix */ -tSCC zSolaris_SocketName[] = - "solaris_socket"; +tSCC zSolaris_Stdio_TagName[] = + "solaris_stdio_tag"; /* * File name selection pattern */ -tSCC zSolaris_SocketList[] = - "sys/socket.h\0"; +tSCC zSolaris_Stdio_TagList[] = + "stdio_tag.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_SocketMachs (const char**)NULL +#define apzSolaris_Stdio_TagMachs (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_Stdio_Tag fix - */ -tSCC zSolaris_Stdio_TagName[] = - "solaris_stdio_tag"; - -/* - * File name selection pattern - */ -tSCC zSolaris_Stdio_TagList[] = - "stdio_tag.h\0"; -/* - * 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"; +tSCC zSolaris_Stdio_TagSelect0[] = + "__cplusplus < 54321L"; /* * content bypass pattern - skip fix if pattern found @@ -6170,96 +5677,6 @@ static const char* apzSolaris_Stdio_TagPatch[] = { "sed", /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Unistd fix - */ -tSCC zSolaris_UnistdName[] = - "solaris_unistd"; - -/* - * File name selection pattern - */ -tSCC zSolaris_UnistdList[] = - "unistd.h\0"; -/* - * 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[] = - "solaris_widec"; - -/* - * File name selection pattern - */ -tSCC zSolaris_WidecList[] = - "widec.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzSolaris_WidecMachs[] = { - "*-*-solaris2.[0-5]", - "*-*-solaris2.[0-5].*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSolaris_WidecSelect0[] = - "#include "; - -/* - * 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 ", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Statsswtch fix */ tSCC zStatsswtchName[] = @@ -6981,45 +6398,6 @@ static const char* apzSvr4_GetcwdPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Svr4_Krnl fix - */ -tSCC zSvr4_KrnlName[] = - "svr4_krnl"; - -/* - * File name selection pattern - */ -tSCC zSvr4_KrnlList[] = - "fs/rfs/rf_cache.h\0sys/erec.h\0sys/err.h\0sys/char.h\0sys/getpages.h\0sys/map.h\0sys/cmn_err.h\0sys/kdebugger.h\0"; -/* - * 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[] = @@ -7028,1028 +6406,343 @@ tSCC zSvr4_ProfilName[] = /* * File name selection pattern */ -tSCC zSvr4_ProfilList[] = - "stdlib.h\0unistd.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzSvr4_ProfilMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSvr4_ProfilSelect0[] = - "profil\\(unsigned short \\*, unsigned int, unsigned int, unsigned int\\)"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSvr4_ProfilBypass0[] = - "Silicon Graphics"; - -#define SVR4_PROFIL_TEST_CT 2 -static tTestDesc aSvr4_ProfilTests[] = { - { TT_NEGREP, zSvr4_ProfilBypass0, (regex_t*)NULL }, - { TT_EGREP, zSvr4_ProfilSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Svr4_Profil - */ -static const char* apzSvr4_ProfilPatch[] = { - "format", - "profil(unsigned short *, size_t, int, unsigned int)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Svr4_Sighandler_Type fix - */ -tSCC zSvr4_Sighandler_TypeName[] = - "svr4_sighandler_type"; - -/* - * File name selection pattern - */ -tSCC zSvr4_Sighandler_TypeList[] = - "sys/signal.h\0"; -/* - * 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\0"; -/* - * 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[] = - "sysv68_string"; - -/* - * File name selection pattern - */ -tSCC zSysv68_StringList[] = - "testing.h\0string.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzSysv68_StringMachs (const char**)NULL - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSysv68_StringBypass0[] = - "_CLASSIC_ANSI_TYPES"; - -#define SYSV68_STRING_TEST_CT 1 -static tTestDesc aSysv68_StringTests[] = { - { TT_NEGREP, zSysv68_StringBypass0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Sysv68_String - */ -static const char* apzSysv68_StringPatch[] = { "sed", - "-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);/", - "-e", "/^extern char$/N", - "-e", "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/", - "-e", "/^extern int$/N", - "-e", "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/", - "-e", "/^\tstrncmp(),$/N", - "-e", "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n\ -extern unsigned int\\\n\ -\\2/", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Sysz_Stdlib_For_Sun fix - */ -tSCC zSysz_Stdlib_For_SunName[] = - "sysz_stdlib_for_sun"; - -/* - * File name selection pattern - */ -tSCC zSysz_Stdlib_For_SunList[] = - "stdlib.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzSysz_Stdlib_For_SunMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSysz_Stdlib_For_SunSelect0[] = - "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\("; - -/* - * 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 }, }; - -/* - * Fix Command Arguments for Sysz_Stdlib_For_Sun - */ -static const char* apzSysz_Stdlib_For_SunPatch[] = { - "format", - "void *\t%1(", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Thread_Keyword fix - */ -tSCC zThread_KeywordName[] = - "thread_keyword"; - -/* - * File name selection pattern - */ -tSCC zThread_KeywordList[] = - "pthread.h\0bits/sigthread.h\0"; -/* - * 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[] = - "tinfo_cplusplus"; - -/* - * File name selection pattern - */ -tSCC zTinfo_CplusplusList[] = - "tinfo.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzTinfo_CplusplusMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zTinfo_CplusplusSelect0[] = - "[ \t]_cplusplus"; - -#define TINFO_CPLUSPLUS_TEST_CT 1 -static tTestDesc aTinfo_CplusplusTests[] = { - { TT_EGREP, zTinfo_CplusplusSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Tinfo_Cplusplus - */ -static const char* apzTinfo_CplusplusPatch[] = { - "format", - " __cplusplus", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Ultrix_Atexit_Param fix - */ -tSCC zUltrix_Atexit_ParamName[] = - "ultrix_atexit_param"; - -/* - * File name selection pattern - */ -tSCC zUltrix_Atexit_ParamList[] = - "stdlib.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzUltrix_Atexit_ParamMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zUltrix_Atexit_ParamSelect0[] = - "atexit\\(.*\\(\\)"; - -#define ULTRIX_ATEXIT_PARAM_TEST_CT 1 -static tTestDesc aUltrix_Atexit_ParamTests[] = { - { TT_EGREP, zUltrix_Atexit_ParamSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Ultrix_Atexit_Param - */ -static const char* apzUltrix_Atexit_ParamPatch[] = { - "format", - "atexit( void (*__func)( void )", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Ultrix_Atof_Param fix - */ -tSCC zUltrix_Atof_ParamName[] = - "ultrix_atof_param"; - -/* - * File name selection pattern - */ -tSCC zUltrix_Atof_ParamList[] = - "math.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzUltrix_Atof_ParamMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zUltrix_Atof_ParamSelect0[] = - "atof\\([ \t]*char"; - -#define ULTRIX_ATOF_PARAM_TEST_CT 1 -static tTestDesc aUltrix_Atof_ParamTests[] = { - { TT_EGREP, zUltrix_Atof_ParamSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Ultrix_Atof_Param - */ -static const char* apzUltrix_Atof_ParamPatch[] = { - "format", - "atof(const char", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Ultrix_Const fix - */ -tSCC zUltrix_ConstName[] = - "ultrix_const"; - -/* - * File name selection pattern - */ -tSCC zUltrix_ConstList[] = - "stdio.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzUltrix_ConstMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zUltrix_ConstSelect0[] = - "perror\\( char \\*"; - -#define ULTRIX_CONST_TEST_CT 1 -static tTestDesc aUltrix_ConstTests[] = { - { TT_EGREP, zUltrix_ConstSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Ultrix_Const - */ -static const char* apzUltrix_ConstPatch[] = { - "format", - "%1 const %3 *__", - "([ \t*](perror|fputs|fwrite|scanf|fscanf)\\(.*)[ \t]+(char|void) \\*__", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Ultrix_Const2 fix - */ -tSCC zUltrix_Const2Name[] = - "ultrix_const2"; - -/* - * File name selection pattern - */ -tSCC zUltrix_Const2List[] = - "stdio.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzUltrix_Const2Machs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zUltrix_Const2Select0[] = - "\\*fopen\\( char \\*"; - -#define ULTRIX_CONST2_TEST_CT 1 -static tTestDesc aUltrix_Const2Tests[] = { - { TT_EGREP, zUltrix_Const2Select0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Ultrix_Const2 - */ -static const char* apzUltrix_Const2Patch[] = { - "format", - "%1( const char *%3, const char *", - "([ \t*](fopen|sscanf|popen|tempnam))\\([ \t]*char[ \t]*\\*([^,]*),[ \t]*char[ \t]*\\*[ \t]*", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Ultrix_Const3 fix - */ -tSCC zUltrix_Const3Name[] = - "ultrix_const3"; - -/* - * File name selection pattern - */ -tSCC zUltrix_Const3List[] = - "stdio.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzUltrix_Const3Machs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zUltrix_Const3Select0[] = - "fdopen\\( .*, char \\*"; - -#define ULTRIX_CONST3_TEST_CT 1 -static tTestDesc aUltrix_Const3Tests[] = { - { TT_EGREP, zUltrix_Const3Select0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Ultrix_Const3 - */ -static const char* apzUltrix_Const3Patch[] = { - "format", - "%1 const %3 *__", - "([ \t*](fdopen)\\(.*)[ \t]+(char|void) \\*__", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Ultrix_Fix_Fixproto fix - */ -tSCC zUltrix_Fix_FixprotoName[] = - "ultrix_fix_fixproto"; - -/* - * File name selection pattern - */ -tSCC zUltrix_Fix_FixprotoList[] = - "sys/utsname.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzUltrix_Fix_FixprotoMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zUltrix_Fix_FixprotoSelect0[] = - "ULTRIX"; - -#define ULTRIX_FIX_FIXPROTO_TEST_CT 1 -static tTestDesc aUltrix_Fix_FixprotoTests[] = { - { TT_EGREP, zUltrix_Fix_FixprotoSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Ultrix_Fix_Fixproto - */ -static const char* apzUltrix_Fix_FixprotoPatch[] = { - "format", - "struct utsname;\n\ -%0", - "^[ \t]*extern[ \t]*int[ \t]*uname\\(\\);", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Ultrix_Ifdef fix - */ -tSCC zUltrix_IfdefName[] = - "ultrix_ifdef"; - -/* - * File name selection pattern - */ -tSCC zUltrix_IfdefList[] = - "sys/file.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzUltrix_IfdefMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zUltrix_IfdefSelect0[] = - "^#ifdef KERNEL[ \t]+&&"; - -#define ULTRIX_IFDEF_TEST_CT 1 -static tTestDesc aUltrix_IfdefTests[] = { - { TT_EGREP, zUltrix_IfdefSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Ultrix_Ifdef - */ -static const char* apzUltrix_IfdefPatch[] = { - "format", - "#if defined(KERNEL) &&", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Ultrix_Locale fix - */ -tSCC zUltrix_LocaleName[] = - "ultrix_locale"; - -/* - * File name selection pattern - */ -tSCC zUltrix_LocaleList[] = - "locale.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzUltrix_LocaleMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zUltrix_LocaleSelect0[] = - "@\\(#\\)locale\\.h.*6\\.1.*\\(ULTRIX\\)"; - -#define ULTRIX_LOCALE_TEST_CT 1 -static tTestDesc aUltrix_LocaleTests[] = { - { TT_EGREP, zUltrix_LocaleSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Ultrix_Locale - */ -static const char* apzUltrix_LocalePatch[] = { - "wrap", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Ultrix_Math_Ifdef fix - */ -tSCC zUltrix_Math_IfdefName[] = - "ultrix_math_ifdef"; - -/* - * File name selection pattern - */ -tSCC zUltrix_Math_IfdefList[] = - "sys/limits.h\0float.h\0math.h\0"; -/* - * 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 -static tTestDesc aUltrix_Math_IfdefTests[] = { - { TT_EGREP, zUltrix_Math_IfdefSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Ultrix_Math_Ifdef - */ -static const char* apzUltrix_Math_IfdefPatch[] = { - "format", - "%1", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Ultrix_Nested_Ioctl fix - */ -tSCC zUltrix_Nested_IoctlName[] = - "ultrix_nested_ioctl"; - -/* - * File name selection pattern - */ -tSCC zUltrix_Nested_IoctlList[] = - "sys/ioctl.h\0"; -/* - * 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 -static tTestDesc aUltrix_Nested_IoctlTests[] = { - { TT_EGREP, zUltrix_Nested_IoctlSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Ultrix_Nested_Ioctl - */ -static const char* apzUltrix_Nested_IoctlPatch[] = { "sed", - "-e", "/^\\/\\* #define SIOCSCREEN/s@/\\* screend@*//* screend@", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Ultrix_Nested_Svc fix - */ -tSCC zUltrix_Nested_SvcName[] = - "ultrix_nested_svc"; - -/* - * File name selection pattern - */ -tSCC zUltrix_Nested_SvcList[] = - "rpc/svc.h\0"; -/* - * 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 -static tTestDesc aUltrix_Nested_SvcTests[] = { - { TT_EGREP, zUltrix_Nested_SvcSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Ultrix_Nested_Svc - */ -static const char* apzUltrix_Nested_SvcPatch[] = { "sed", - "-e", "s@^\\( \\*\tint protocol; \\)/\\*@\\1*/ /*@", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Ultrix_Stat fix - */ -tSCC zUltrix_StatName[] = - "ultrix_stat"; - -/* - * File name selection pattern - */ -tSCC zUltrix_StatList[] = - "sys/stat.h\0"; +tSCC zSvr4_ProfilList[] = + "stdlib.h\0unistd.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_StatMachs (const char**)NULL +#define apzSvr4_ProfilMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_StatSelect0[] = - "@\\(#\\)stat\\.h.*6\\.1.*\\(ULTRIX\\)"; +tSCC zSvr4_ProfilSelect0[] = + "profil\\(unsigned short \\*, unsigned int, unsigned int, unsigned int\\)"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSvr4_ProfilBypass0[] = + "Silicon Graphics"; -#define ULTRIX_STAT_TEST_CT 1 -static tTestDesc aUltrix_StatTests[] = { - { TT_EGREP, zUltrix_StatSelect0, (regex_t*)NULL }, }; +#define SVR4_PROFIL_TEST_CT 2 +static tTestDesc aSvr4_ProfilTests[] = { + { TT_NEGREP, zSvr4_ProfilBypass0, (regex_t*)NULL }, + { TT_EGREP, zSvr4_ProfilSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Stat + * Fix Command Arguments for Svr4_Profil */ -static 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", +static const char* apzSvr4_ProfilPatch[] = { + "format", + "profil(unsigned short *, size_t, int, unsigned int)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Static fix + * Description of Svr4_Sighandler_Type fix */ -tSCC zUltrix_StaticName[] = - "ultrix_static"; +tSCC zSvr4_Sighandler_TypeName[] = + "svr4_sighandler_type"; /* * File name selection pattern */ -tSCC zUltrix_StaticList[] = - "machine/cpu.h\0"; +tSCC zSvr4_Sighandler_TypeList[] = + "sys/signal.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_StaticMachs (const char**)NULL +#define apzSvr4_Sighandler_TypeMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_StaticSelect0[] = - "#include \"r[34]_cpu"; +tSCC zSvr4_Sighandler_TypeSelect0[] = + "void *\\(\\*\\)\\(\\)"; -#define ULTRIX_STATIC_TEST_CT 1 -static tTestDesc aUltrix_StaticTests[] = { - { TT_EGREP, zUltrix_StaticSelect0, (regex_t*)NULL }, }; +#define SVR4_SIGHANDLER_TYPE_TEST_CT 1 +static tTestDesc aSvr4_Sighandler_TypeTests[] = { + { TT_EGREP, zSvr4_Sighandler_TypeSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Static + * Fix Command Arguments for Svr4_Sighandler_Type */ -static const char* apzUltrix_StaticPatch[] = { "sed", - "-e", "s/^static struct tlb_pid_state/struct tlb_pid_state/", - "-e", "s/^#include \"r3_cpu\\.h\"$/#include /", - "-e", "s/^#include \"r4_cpu\\.h\"$/#include /", +static const char* apzSvr4_Sighandler_TypePatch[] = { + "format", + "void (*)(int)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Stdlib fix + * Description of Svr4_Undeclared_Getrnge fix */ -tSCC zUltrix_StdlibName[] = - "ultrix_stdlib"; +tSCC zSvr4_Undeclared_GetrngeName[] = + "svr4_undeclared_getrnge"; /* * File name selection pattern */ -tSCC zUltrix_StdlibList[] = - "stdlib.h\0"; +tSCC zSvr4_Undeclared_GetrngeList[] = + "regexp.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_StdlibMachs (const char**)NULL +#define apzSvr4_Undeclared_GetrngeMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_StdlibSelect0[] = - "@\\(#\\)stdlib\\.h.*6\\.1.*\\(ULTRIX\\)"; +tSCC zSvr4_Undeclared_GetrngeSelect0[] = + "getrnge"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSvr4_Undeclared_GetrngeBypass0[] = + "static void getrnge"; -#define ULTRIX_STDLIB_TEST_CT 1 -static tTestDesc aUltrix_StdlibTests[] = { - { TT_EGREP, zUltrix_StdlibSelect0, (regex_t*)NULL }, }; +#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 Ultrix_Stdlib + * Fix Command Arguments for Svr4_Undeclared_Getrnge */ -static const char* apzUltrix_StdlibPatch[] = { "sed", - "-e", "/^char.*getenv( const char .* );.*$/a\\\n\ -int\t\tsetenv( const char *__name, const char *__val, int __ovrwrt );\\\n\ -void\t\tunsetenv( const char *__name );\\\n\ -int\t\tputenv( char *__s );\n", - "-e", "/^char.*getenv();.*$/a\\\n\ -int\tsetenv();\\\n\ -void\tunsetenv();\\\n\ -int\tputenv();\n", +static const char* apzSvr4_Undeclared_GetrngePatch[] = { + "format", + "%0\n\ +static int getrnge ();", + "^static int[ \t]+size;", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Strings fix + * Description of Sysv68_String fix */ -tSCC zUltrix_StringsName[] = - "ultrix_strings"; +tSCC zSysv68_StringName[] = + "sysv68_string"; /* * File name selection pattern */ -tSCC zUltrix_StringsList[] = - "strings.h\0"; +tSCC zSysv68_StringList[] = + "testing.h\0string.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_StringsMachs (const char**)NULL +#define apzSysv68_StringMachs (const char**)NULL /* - * content selection pattern - do fix if pattern found + * content bypass pattern - skip fix if pattern found */ -tSCC zUltrix_StringsSelect0[] = - "@\\(#\\)strings\\.h.*6\\.1.*\\(ULTRIX\\)"; +tSCC zSysv68_StringBypass0[] = + "_CLASSIC_ANSI_TYPES"; -#define ULTRIX_STRINGS_TEST_CT 1 -static tTestDesc aUltrix_StringsTests[] = { - { TT_EGREP, zUltrix_StringsSelect0, (regex_t*)NULL }, }; +#define SYSV68_STRING_TEST_CT 1 +static tTestDesc aSysv68_StringTests[] = { + { TT_NEGREP, zSysv68_StringBypass0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Strings + * Fix Command Arguments for Sysv68_String */ -static const char* apzUltrix_StringsPatch[] = { - "wrap", +static const char* apzSysv68_StringPatch[] = { "sed", + "-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);/", + "-e", "/^extern char$/N", + "-e", "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/", + "-e", "/^extern int$/N", + "-e", "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/", + "-e", "/^\tstrncmp(),$/N", + "-e", "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n\ +extern unsigned int\\\n\ +\\2/", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Strings2 fix + * Description of Sysz_Stdlib_For_Sun fix */ -tSCC zUltrix_Strings2Name[] = - "ultrix_strings2"; +tSCC zSysz_Stdlib_For_SunName[] = + "sysz_stdlib_for_sun"; /* * File name selection pattern */ -tSCC zUltrix_Strings2List[] = - "strings.h\0"; +tSCC zSysz_Stdlib_For_SunList[] = + "stdlib.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_Strings2Machs (const char**)NULL +#define apzSysz_Stdlib_For_SunMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_Strings2Select0[] = - "@\\(#\\)strings\\.h.*6\\.1.*\\(ULTRIX\\)"; +tSCC zSysz_Stdlib_For_SunSelect0[] = + "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\("; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSysz_Stdlib_For_SunBypass0[] = + "_CLASSIC_ANSI_TYPES"; -#define ULTRIX_STRINGS2_TEST_CT 1 -static tTestDesc aUltrix_Strings2Tests[] = { - { TT_EGREP, zUltrix_Strings2Select0, (regex_t*)NULL }, }; +#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 }, }; /* - * Fix Command Arguments for Ultrix_Strings2 + * Fix Command Arguments for Sysz_Stdlib_For_Sun */ -static const char* apzUltrix_Strings2Patch[] = { "sed", - "-e", "/^.*strncmp( const .* );.*/a\\\n\ -\\\n\ -extern int\\\n\ -\tstrcasecmp( const char *__s1, const char *__s2),\\\n\ -\tstrncasecmp( const char *__s1, const char *__s2, size_t __n );\n", - "-e", "/^.*strncmp();.*/a\\\n\ -extern int\\\n\ -\tstrcasecmp(),\\\n\ -\tstrncasecmp();\n", +static const char* apzSysz_Stdlib_For_SunPatch[] = { + "format", + "void *\t%1(", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Sys_Time fix + * Description of Thread_Keyword fix */ -tSCC zUltrix_Sys_TimeName[] = - "ultrix_sys_time"; +tSCC zThread_KeywordName[] = + "thread_keyword"; /* * File name selection pattern */ -tSCC zUltrix_Sys_TimeList[] = - "sys/time.h\0"; +tSCC zThread_KeywordList[] = + "pthread.h\0bits/sigthread.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_Sys_TimeMachs (const char**)NULL +#define apzThread_KeywordMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_Sys_TimeSelect0[] = - "@\\(#\\)time\\.h.*6\\.1.*\\(ULTRIX\\)"; +tSCC zThread_KeywordSelect0[] = + "([* ])__thread([,)])"; -#define ULTRIX_SYS_TIME_TEST_CT 1 -static tTestDesc aUltrix_Sys_TimeTests[] = { - { TT_EGREP, zUltrix_Sys_TimeSelect0, (regex_t*)NULL }, }; +#define THREAD_KEYWORD_TEST_CT 1 +static tTestDesc aThread_KeywordTests[] = { + { TT_EGREP, zThread_KeywordSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Sys_Time + * Fix Command Arguments for Thread_Keyword */ -static const char* apzUltrix_Sys_TimePatch[] = { "sed", - "-e", "/^extern.*time_t.*time( time_t .* );.*$/a\\\n\ -\\\n\ -extern int adjtime(struct timeval *, struct timeval *);\\\n\ -extern int getitimer(int, struct itimerval *);\\\n\ -extern int setitimer(int, struct itimerval *, struct itimerval *);\\\n\ -extern int gettimeofday(struct timeval *, struct timezone *);\\\n\ -extern int settimeofday(struct timeval *, struct timezone *);\\\n\ -extern void profil(const void *, size_t, size_t, unsigned int);\\\n\ -extern int stime(const time_t *);\\\n\ -extern int utimes(const char *, const struct timeval[2]);\\\n\ -extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);\n", - "-e", "/^extern.*double.*difftime();.*$/a\\\n\ -extern\tint adjtime();\\\n\ -extern\tint getitimer();\\\n\ -extern\tint setitimer();\\\n\ -extern\tint gettimeofday();\\\n\ -extern\tint settimeofday();\\\n\ -extern\tvoid profil();\\\n\ -extern\tint stime();\\\n\ -extern\tint utimes();\\\n\ -extern\tint select();\n", +static const char* apzThread_KeywordPatch[] = { + "format", + "%1__thr%2", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Unistd fix + * Description of Tinfo_Cplusplus fix */ -tSCC zUltrix_UnistdName[] = - "ultrix_unistd"; +tSCC zTinfo_CplusplusName[] = + "tinfo_cplusplus"; /* * File name selection pattern */ -tSCC zUltrix_UnistdList[] = - "unistd.h\0"; +tSCC zTinfo_CplusplusList[] = + "tinfo.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_UnistdMachs (const char**)NULL +#define apzTinfo_CplusplusMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_UnistdSelect0[] = - "@\\(#\\)unistd\\.h.*6\\.1.*\\(ULTRIX\\)"; +tSCC zTinfo_CplusplusSelect0[] = + "[ \t]_cplusplus"; -#define ULTRIX_UNISTD_TEST_CT 1 -static tTestDesc aUltrix_UnistdTests[] = { - { TT_EGREP, zUltrix_UnistdSelect0, (regex_t*)NULL }, }; +#define TINFO_CPLUSPLUS_TEST_CT 1 +static tTestDesc aTinfo_CplusplusTests[] = { + { TT_EGREP, zTinfo_CplusplusSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Unistd + * Fix Command Arguments for Tinfo_Cplusplus */ -static const char* apzUltrix_UnistdPatch[] = { "sed", - "-e", "/^[ \t]*getgroups(),.*$/a\\\n\ -\tgetpagesize(),\n", - "-e", "/^[ \t]*fork(),.*$/a\\\n\ -\tvfork(),\n", +static const char* apzTinfo_CplusplusPatch[] = { + "format", + " __cplusplus", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Unicosmk_Restrict fix + * Description of Ultrix_Const fix */ -tSCC zUnicosmk_RestrictName[] = - "unicosmk_restrict"; +tSCC zUltrix_ConstName[] = + "ultrix_const"; /* * File name selection pattern */ -tSCC zUnicosmk_RestrictList[] = - "stdio.h\0stdlib.h\0wchar.h\0"; +tSCC zUltrix_ConstList[] = + "stdio.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzUnicosmk_RestrictMachs[] = { - "*-*-unicosmk*", - (const char*)NULL }; +#define apzUltrix_ConstMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUnicosmk_RestrictSelect0[] = - "(\\*[ \t]*)restrict([ \t]+)"; +tSCC zUltrix_ConstSelect0[] = + "perror\\( char \\*"; -#define UNICOSMK_RESTRICT_TEST_CT 1 -static tTestDesc aUnicosmk_RestrictTests[] = { - { TT_EGREP, zUnicosmk_RestrictSelect0, (regex_t*)NULL }, }; +#define ULTRIX_CONST_TEST_CT 1 +static tTestDesc aUltrix_ConstTests[] = { + { TT_EGREP, zUltrix_ConstSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Unicosmk_Restrict + * Fix Command Arguments for Ultrix_Const */ -static const char* apzUnicosmk_RestrictPatch[] = { +static const char* apzUltrix_ConstPatch[] = { "format", - "%1__restrict__%2", + "%1 const %3 *__", + "([ \t*](perror|fputs|fwrite|scanf|fscanf)\\(.*)[ \t]+(char|void) \\*__", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Uw7_Byteorder_Fix fix + * Description of Ultrix_Const2 fix */ -tSCC zUw7_Byteorder_FixName[] = - "uw7_byteorder_fix"; +tSCC zUltrix_Const2Name[] = + "ultrix_const2"; /* * File name selection pattern */ -tSCC zUw7_Byteorder_FixList[] = - "arpa/inet.h\0"; +tSCC zUltrix_Const2List[] = + "stdio.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzUw7_Byteorder_FixMachs[] = { - "*-*-sysv4*", - "i?86-*-sysv5*", - "i?86-*-udk*", - "i?86-*-solaris2.[0-4]", - "powerpcle-*-solaris2.[0-4]", - "sparc-*-solaris2.[0-4]", - (const char*)NULL }; +#define apzUltrix_Const2Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUw7_Byteorder_FixSelect0[] = - "in_port_t"; - -/* - * perform the 'test' shell command - do fix on success - */ -tSCC zUw7_Byteorder_FixTest0[] = - "-f sys/byteorder.h"; +tSCC zUltrix_Const2Select0[] = + "\\*fopen\\( char \\*"; -#define UW7_BYTEORDER_FIX_TEST_CT 2 -static tTestDesc aUw7_Byteorder_FixTests[] = { - { TT_TEST, zUw7_Byteorder_FixTest0, 0 /* unused */ }, - { TT_EGREP, zUw7_Byteorder_FixSelect0, (regex_t*)NULL }, }; +#define ULTRIX_CONST2_TEST_CT 1 +static tTestDesc aUltrix_Const2Tests[] = { + { TT_EGREP, zUltrix_Const2Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Uw7_Byteorder_Fix + * Fix Command Arguments for Ultrix_Const2 */ -static const char* apzUw7_Byteorder_FixPatch[] = { +static const char* apzUltrix_Const2Patch[] = { "format", - "", - "^extern.*[ \t](htons|ntohs).*\\(in_port_t\\).*;", + "%1( const char *%3, const char *", + "([ \t*](fopen|sscanf|popen|tempnam))\\([ \t]*char[ \t]*\\*([^,]*),[ \t]*char[ \t]*\\*[ \t]*", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -8313,97 +7006,6 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Windiss_Math1 fix - */ -tSCC zWindiss_Math1Name[] = - "windiss_math1"; - -/* - * File name selection pattern - */ -tSCC zWindiss_Math1List[] = - "math.h\0"; -/* - * 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\0"; -/* - * 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[] = @@ -8572,14 +7174,15 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 254 -#define MACH_LIST_SIZE_LIMIT 261 -#define FIX_COUNT 211 +#define REGEX_COUNT 223 +#define MACH_LIST_SIZE_LIMIT 181 +#define FIX_COUNT 177 /* * Enumerate the fixes */ typedef enum { + AAB_AIX_STDIO_FIXIDX, AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_FIXIDX, AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_FIXIDX, AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX, @@ -8587,10 +7190,6 @@ typedef enum { AAB_FD_ZERO_SELECTBITS_H_FIXIDX, AAB_SOLARIS_SYS_VARARGS_H_FIXIDX, AAB_SUN_MEMCPY_FIXIDX, - AAB_ULTRIX_ANSI_COMPAT_FIXIDX, - AAB_ULTRIX_LIMITS_FIXIDX, - AAB_ULTRIX_MEMORY_FIXIDX, - AAB_ULTRIX_STRING_FIXIDX, AIX_PTHREAD_FIXIDX, AIX_SYSMACHINE_FIXIDX, AIX_SYSWAIT_FIXIDX, @@ -8682,8 +7281,6 @@ typedef enum { ISC_FMOD_FIXIDX, ISC_OMITS_WITH_STDC_FIXIDX, KANDR_CONCAT_FIXIDX, - LIBC1_G_VA_LIST_FIXIDX, - LIBC1_IFDEFD_MEMX_FIXIDX, LINUX_IA64_UCONTEXT_FIXIDX, LYNXOS_NO_WARNING_IN_SYS_TIME_H_FIXIDX, LYNXOS_MISSING_PUTENV_FIXIDX, @@ -8692,7 +7289,6 @@ typedef enum { MATH_EXCEPTION_FIXIDX, MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX, NESTED_AUTH_DES_FIXIDX, - NESTED_MOTOROLA_FIXIDX, NESTED_SYS_LIMITS_FIXIDX, NETBSD_C99_INLINE_1_FIXIDX, NETBSD_C99_INLINE_2_FIXIDX, @@ -8714,24 +7310,18 @@ typedef enum { RS6000_FCHMOD_FIXIDX, RS6000_PARAM_FIXIDX, SCO_MATH_FIXIDX, - SCO_REGSET_FIXIDX, - SCO_STATIC_FUNC_FIXIDX, - SCO_UTIME_FIXIDX, SOLARIS_MATH_1_FIXIDX, SOLARIS_MATH_2_FIXIDX, SOLARIS_MATH_3_FIXIDX, SOLARIS_MATH_4_FIXIDX, SOLARIS_MATH_8_FIXIDX, SOLARIS_MATH_9_FIXIDX, - SOLARIS_MUTEX_INIT_1_FIXIDX, + SOLARIS_MATH_10_FIXIDX, SOLARIS_MUTEX_INIT_2_FIXIDX, SOLARIS_RWLOCK_INIT_1_FIXIDX, SOLARIS_ONCE_INIT_1_FIXIDX, SOLARIS_ONCE_INIT_2_FIXIDX, - SOLARIS_SOCKET_FIXIDX, SOLARIS_STDIO_TAG_FIXIDX, - SOLARIS_UNISTD_FIXIDX, - SOLARIS_WIDEC_FIXIDX, STATSSWTCH_FIXIDX, STDIO_STDARG_H_FIXIDX, STDIO_VA_LIST_FIXIDX, @@ -8750,7 +7340,6 @@ typedef enum { SUNOS_STRLEN_FIXIDX, SVR4_DISABLE_OPT_FIXIDX, SVR4_GETCWD_FIXIDX, - SVR4_KRNL_FIXIDX, SVR4_PROFIL_FIXIDX, SVR4_SIGHANDLER_TYPE_FIXIDX, SVR4_UNDECLARED_GETRNGE_FIXIDX, @@ -8758,35 +7347,14 @@ typedef enum { SYSZ_STDLIB_FOR_SUN_FIXIDX, THREAD_KEYWORD_FIXIDX, TINFO_CPLUSPLUS_FIXIDX, - ULTRIX_ATEXIT_PARAM_FIXIDX, - ULTRIX_ATOF_PARAM_FIXIDX, ULTRIX_CONST_FIXIDX, ULTRIX_CONST2_FIXIDX, - ULTRIX_CONST3_FIXIDX, - ULTRIX_FIX_FIXPROTO_FIXIDX, - ULTRIX_IFDEF_FIXIDX, - ULTRIX_LOCALE_FIXIDX, - ULTRIX_MATH_IFDEF_FIXIDX, - ULTRIX_NESTED_IOCTL_FIXIDX, - ULTRIX_NESTED_SVC_FIXIDX, - ULTRIX_STAT_FIXIDX, - ULTRIX_STATIC_FIXIDX, - ULTRIX_STDLIB_FIXIDX, - ULTRIX_STRINGS_FIXIDX, - ULTRIX_STRINGS2_FIXIDX, - ULTRIX_SYS_TIME_FIXIDX, - ULTRIX_UNISTD_FIXIDX, - UNICOSMK_RESTRICT_FIXIDX, - UW7_BYTEORDER_FIX_FIXIDX, VA_I960_MACRO_FIXIDX, VOID_NULL_FIXIDX, VXWORKS_GCC_PROBLEM_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, @@ -8794,6 +7362,11 @@ typedef enum { } t_fixinc_idx; tFixDesc fixDescList[ FIX_COUNT ] = { + { zAab_Aix_StdioName, zAab_Aix_StdioList, + apzAab_Aix_StdioMachs, + AAB_AIX_STDIO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAab_Aix_StdioTests, apzAab_Aix_StdioPatch, 0 }, + { zAab_Darwin7_9_Long_Double_FuncsName, zAab_Darwin7_9_Long_Double_FuncsList, apzAab_Darwin7_9_Long_Double_FuncsMachs, AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, @@ -8829,26 +7402,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, aAab_Sun_MemcpyTests, apzAab_Sun_MemcpyPatch, 0 }, - { zAab_Ultrix_Ansi_CompatName, zAab_Ultrix_Ansi_CompatList, - apzAab_Ultrix_Ansi_CompatMachs, - AAB_ULTRIX_ANSI_COMPAT_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, - aAab_Ultrix_Ansi_CompatTests, apzAab_Ultrix_Ansi_CompatPatch, 0 }, - - { 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, 0 }, - - { 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, 0 }, - - { 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, 0 }, - { zAix_PthreadName, zAix_PthreadList, apzAix_PthreadMachs, AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9304,16 +7857,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aKandr_ConcatTests, apzKandr_ConcatPatch, 0 }, - { zLibc1_G_Va_ListName, zLibc1_G_Va_ListList, - apzLibc1_G_Va_ListMachs, - LIBC1_G_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aLibc1_G_Va_ListTests, apzLibc1_G_Va_ListPatch, 0 }, - - { zLibc1_Ifdefd_MemxName, zLibc1_Ifdefd_MemxList, - apzLibc1_Ifdefd_MemxMachs, - LIBC1_IFDEFD_MEMX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aLibc1_Ifdefd_MemxTests, apzLibc1_Ifdefd_MemxPatch, 0 }, - { zLinux_Ia64_UcontextName, zLinux_Ia64_UcontextList, apzLinux_Ia64_UcontextMachs, LINUX_IA64_UCONTEXT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9354,11 +7897,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aNested_Auth_DesTests, apzNested_Auth_DesPatch, 0 }, - { zNested_MotorolaName, zNested_MotorolaList, - apzNested_MotorolaMachs, - NESTED_MOTOROLA_TEST_CT, FD_MACH_ONLY, - aNested_MotorolaTests, apzNested_MotorolaPatch, 0 }, - { zNested_Sys_LimitsName, zNested_Sys_LimitsList, apzNested_Sys_LimitsMachs, NESTED_SYS_LIMITS_TEST_CT, FD_MACH_ONLY, @@ -9464,21 +8002,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { 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, - aSco_Static_FuncTests, apzSco_Static_FuncPatch, 0 }, - - { zSco_UtimeName, zSco_UtimeList, - apzSco_UtimeMachs, - SCO_UTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aSco_UtimeTests, apzSco_UtimePatch, 0 }, - { zSolaris_Math_1Name, zSolaris_Math_1List, apzSolaris_Math_1Machs, SOLARIS_MATH_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9509,10 +8032,10 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SOLARIS_MATH_9_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSolaris_Math_9Tests, apzSolaris_Math_9Patch, 0 }, - { zSolaris_Mutex_Init_1Name, zSolaris_Mutex_Init_1List, - apzSolaris_Mutex_Init_1Machs, - SOLARIS_MUTEX_INIT_1_TEST_CT, FD_MACH_ONLY, - aSolaris_Mutex_Init_1Tests, apzSolaris_Mutex_Init_1Patch, 0 }, + { zSolaris_Math_10Name, zSolaris_Math_10List, + apzSolaris_Math_10Machs, + SOLARIS_MATH_10_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Math_10Tests, apzSolaris_Math_10Patch, 0 }, { zSolaris_Mutex_Init_2Name, zSolaris_Mutex_Init_2List, apzSolaris_Mutex_Init_2Machs, @@ -9534,26 +8057,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SOLARIS_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSolaris_Once_Init_2Tests, apzSolaris_Once_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, - aSolaris_WidecTests, apzSolaris_WidecPatch, 0 }, - { zStatsswtchName, zStatsswtchList, apzStatsswtchMachs, STATSSWTCH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9644,11 +8152,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { 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, @@ -9684,16 +8187,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { TINFO_CPLUSPLUS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aTinfo_CplusplusTests, apzTinfo_CplusplusPatch, 0 }, - { zUltrix_Atexit_ParamName, zUltrix_Atexit_ParamList, - apzUltrix_Atexit_ParamMachs, - ULTRIX_ATEXIT_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aUltrix_Atexit_ParamTests, apzUltrix_Atexit_ParamPatch, 0 }, - - { zUltrix_Atof_ParamName, zUltrix_Atof_ParamList, - apzUltrix_Atof_ParamMachs, - ULTRIX_ATOF_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aUltrix_Atof_ParamTests, apzUltrix_Atof_ParamPatch, 0 }, - { zUltrix_ConstName, zUltrix_ConstList, apzUltrix_ConstMachs, ULTRIX_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9704,86 +8197,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ULTRIX_CONST2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aUltrix_Const2Tests, apzUltrix_Const2Patch, 0 }, - { zUltrix_Const3Name, zUltrix_Const3List, - apzUltrix_Const3Machs, - ULTRIX_CONST3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aUltrix_Const3Tests, apzUltrix_Const3Patch, 0 }, - - { zUltrix_Fix_FixprotoName, zUltrix_Fix_FixprotoList, - apzUltrix_Fix_FixprotoMachs, - ULTRIX_FIX_FIXPROTO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aUltrix_Fix_FixprotoTests, apzUltrix_Fix_FixprotoPatch, 0 }, - - { zUltrix_IfdefName, zUltrix_IfdefList, - apzUltrix_IfdefMachs, - ULTRIX_IFDEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aUltrix_IfdefTests, apzUltrix_IfdefPatch, 0 }, - - { zUltrix_LocaleName, zUltrix_LocaleList, - apzUltrix_LocaleMachs, - ULTRIX_LOCALE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aUltrix_LocaleTests, apzUltrix_LocalePatch, 0 }, - - { zUltrix_Math_IfdefName, zUltrix_Math_IfdefList, - apzUltrix_Math_IfdefMachs, - ULTRIX_MATH_IFDEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aUltrix_Math_IfdefTests, apzUltrix_Math_IfdefPatch, 0 }, - - { zUltrix_Nested_IoctlName, zUltrix_Nested_IoctlList, - apzUltrix_Nested_IoctlMachs, - ULTRIX_NESTED_IOCTL_TEST_CT, FD_MACH_ONLY, - aUltrix_Nested_IoctlTests, apzUltrix_Nested_IoctlPatch, 0 }, - - { zUltrix_Nested_SvcName, zUltrix_Nested_SvcList, - apzUltrix_Nested_SvcMachs, - ULTRIX_NESTED_SVC_TEST_CT, FD_MACH_ONLY, - aUltrix_Nested_SvcTests, apzUltrix_Nested_SvcPatch, 0 }, - - { zUltrix_StatName, zUltrix_StatList, - apzUltrix_StatMachs, - ULTRIX_STAT_TEST_CT, FD_MACH_ONLY, - aUltrix_StatTests, apzUltrix_StatPatch, 0 }, - - { zUltrix_StaticName, zUltrix_StaticList, - apzUltrix_StaticMachs, - ULTRIX_STATIC_TEST_CT, FD_MACH_ONLY, - aUltrix_StaticTests, apzUltrix_StaticPatch, 0 }, - - { zUltrix_StdlibName, zUltrix_StdlibList, - apzUltrix_StdlibMachs, - ULTRIX_STDLIB_TEST_CT, FD_MACH_ONLY, - aUltrix_StdlibTests, apzUltrix_StdlibPatch, 0 }, - - { zUltrix_StringsName, zUltrix_StringsList, - apzUltrix_StringsMachs, - ULTRIX_STRINGS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aUltrix_StringsTests, apzUltrix_StringsPatch, 0 }, - - { zUltrix_Strings2Name, zUltrix_Strings2List, - apzUltrix_Strings2Machs, - ULTRIX_STRINGS2_TEST_CT, FD_MACH_ONLY, - aUltrix_Strings2Tests, apzUltrix_Strings2Patch, 0 }, - - { zUltrix_Sys_TimeName, zUltrix_Sys_TimeList, - apzUltrix_Sys_TimeMachs, - ULTRIX_SYS_TIME_TEST_CT, FD_MACH_ONLY, - aUltrix_Sys_TimeTests, apzUltrix_Sys_TimePatch, 0 }, - - { zUltrix_UnistdName, zUltrix_UnistdList, - apzUltrix_UnistdMachs, - ULTRIX_UNISTD_TEST_CT, FD_MACH_ONLY, - aUltrix_UnistdTests, apzUltrix_UnistdPatch, 0 }, - - { zUnicosmk_RestrictName, zUnicosmk_RestrictList, - apzUnicosmk_RestrictMachs, - UNICOSMK_RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aUnicosmk_RestrictTests, apzUnicosmk_RestrictPatch, 0 }, - - { zUw7_Byteorder_FixName, zUw7_Byteorder_FixList, - apzUw7_Byteorder_FixMachs, - UW7_BYTEORDER_FIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aUw7_Byteorder_FixTests, apzUw7_Byteorder_FixPatch, 0 }, - { zVa_I960_MacroName, zVa_I960_MacroList, apzVa_I960_MacroMachs, VA_I960_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9814,21 +8227,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { 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,