X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=fixincludes%2Ffixincl.x;h=aa2568921788392f8ede31fad36d237e2fe7f652;hp=cd1b3c5206bab36ecf644931c9d7d9d6457c3096;hb=b32d497cafb846c4d5954a9b10f39ad1767579d0;hpb=458caa241dc32254a638b0306465d91835864c86 diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index cd1b3c5206b..aa256892178 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Tuesday September 26, 2006 at 11:56:29 AM EDT + * It has been AutoGen-ed Saturday September 6, 2008 at 11:42:15 AM PDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Tue Sep 26 11:56:29 EDT 2006 +/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Sep 6 11:42:15 PDT 2008 * * You must regenerate it. Use the ./genfixes script. * @@ -15,30 +15,89 @@ * 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 198 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, 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. See the file "COPYING". If not, - * write to: The Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ +#ifndef SED_PROGRAM +#define SED_PROGRAM "/usr/bin/sed" +#endif +static char const sed_cmd_z[] = SED_PROGRAM; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * 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 }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -51,7 +110,7 @@ tSCC zAab_Darwin7_9_Long_Double_FuncsName[] = * File name selection pattern */ tSCC zAab_Darwin7_9_Long_Double_FuncsList[] = - "|architecture/ppc/math.h|"; + "architecture/ppc/math.h\0"; /* * Machine/OS name selection pattern */ @@ -165,7 +224,7 @@ tSCC zAab_Darwin7_9_Long_Double_Funcs_2Name[] = * File name selection pattern */ tSCC zAab_Darwin7_9_Long_Double_Funcs_2List[] = - "|math.h|"; + "math.h\0"; /* * Machine/OS name selection pattern */ @@ -203,7 +262,7 @@ tSCC zAab_Fd_Zero_Asm_Posix_Types_HName[] = * File name selection pattern */ tSCC zAab_Fd_Zero_Asm_Posix_Types_HList[] = - "|asm/posix_types.h|"; + "asm/posix_types.h\0"; /* * Machine/OS name selection pattern */ @@ -216,10 +275,16 @@ tSCC* apzAab_Fd_Zero_Asm_Posix_Types_HMachs[] = { */ 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 1 +#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_HBypass0, (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 @@ -256,7 +321,7 @@ tSCC zAab_Fd_Zero_Gnu_Types_HName[] = * File name selection pattern */ tSCC zAab_Fd_Zero_Gnu_Types_HList[] = - "|gnu/types.h|"; + "gnu/types.h\0"; /* * Machine/OS name selection pattern */ @@ -300,7 +365,7 @@ tSCC zAab_Fd_Zero_Selectbits_HName[] = * File name selection pattern */ tSCC zAab_Fd_Zero_Selectbits_HList[] = - "|selectbits.h|"; + "selectbits.h\0"; /* * Machine/OS name selection pattern */ @@ -348,7 +413,7 @@ tSCC zAab_Solaris_Sys_Varargs_HName[] = * File name selection pattern */ tSCC zAab_Solaris_Sys_Varargs_HList[] = - "|sys/varargs.h|"; + "sys/varargs.h\0"; /* * Machine/OS name selection pattern */ @@ -380,7 +445,7 @@ tSCC zAab_Sun_MemcpyName[] = * File name selection pattern */ tSCC zAab_Sun_MemcpyList[] = - "|memory.h|"; + "memory.h\0"; /* * Machine/OS name selection pattern */ @@ -415,277 +480,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|"; -/* - * 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|"; -/* - * 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|"; -/* - * 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|"; -/* - * 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 }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -699,7 +494,7 @@ tSCC zAix_PthreadName[] = * File name selection pattern */ tSCC zAix_PthreadList[] = - "|pthread.h|"; + "pthread.h\0"; /* * Machine/OS name selection pattern */ @@ -736,7 +531,7 @@ tSCC zAix_SysmachineName[] = * File name selection pattern */ tSCC zAix_SysmachineList[] = - "|sys/machine.h|"; + "sys/machine.h\0"; /* * Machine/OS name selection pattern */ @@ -771,7 +566,7 @@ tSCC zAix_SyswaitName[] = * File name selection pattern */ tSCC zAix_SyswaitList[] = - "|sys/wait.h|"; + "sys/wait.h\0"; /* * Machine/OS name selection pattern */ @@ -810,7 +605,7 @@ tSCC zAix_Syswait_2Name[] = * File name selection pattern */ tSCC zAix_Syswait_2List[] = - "|sys/wait.h|"; + "sys/wait.h\0"; /* * Machine/OS name selection pattern */ @@ -845,7 +640,7 @@ tSCC zAix_VolatileName[] = * File name selection pattern */ tSCC zAix_VolatileList[] = - "|sys/signal.h|"; + "sys/signal.h\0"; /* * Machine/OS name selection pattern */ @@ -880,7 +675,7 @@ tSCC zAlpha___AssertName[] = * File name selection pattern */ tSCC zAlpha___AssertList[] = - "|assert.h|"; + "assert.h\0"; /* * Machine/OS name selection pattern */ @@ -953,7 +748,7 @@ tSCC zAlpha___Extern_Prefix_StandardsName[] = * File name selection pattern */ tSCC zAlpha___Extern_Prefix_StandardsList[] = - "|standards.h|"; + "standards.h\0"; /* * Machine/OS name selection pattern */ @@ -990,7 +785,7 @@ tSCC zAlpha___Extern_Prefix_Sys_StatName[] = * File name selection pattern */ tSCC zAlpha___Extern_Prefix_Sys_StatList[] = - "|sys/stat.h|sys/mount.h|"; + "sys/stat.h\0sys/mount.h\0"; /* * Machine/OS name selection pattern */ @@ -1027,7 +822,7 @@ tSCC zAlpha_AssertName[] = * File name selection pattern */ tSCC zAlpha_AssertList[] = - "|assert.h|"; + "assert.h\0"; /* * Machine/OS name selection pattern */ @@ -1082,7 +877,7 @@ static tTestDesc aAlpha_Bad_LvalTests[] = { /* * Fix Command Arguments for Alpha_Bad_Lval */ -static const char* apzAlpha_Bad_LvalPatch[] = { "sed", +static const char* apzAlpha_Bad_LvalPatch[] = { sed_cmd_z, "-e", "s/^[ \t]*#[ \t]*define[ \t][ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*\\(_.*\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/", (char*)NULL }; @@ -1097,7 +892,7 @@ tSCC zAlpha_GetoptName[] = * File name selection pattern */ tSCC zAlpha_GetoptList[] = - "|stdio.h|stdlib.h|"; + "stdio.h\0stdlib.h\0"; /* * Machine/OS name selection pattern */ @@ -1132,7 +927,7 @@ tSCC zAlpha_ParensName[] = * File name selection pattern */ tSCC zAlpha_ParensList[] = - "|sym.h|"; + "sym.h\0"; /* * Machine/OS name selection pattern */ @@ -1167,7 +962,7 @@ tSCC zAlpha_PthreadName[] = * File name selection pattern */ tSCC zAlpha_PthreadList[] = - "|pthread.h|"; + "pthread.h\0"; /* * Machine/OS name selection pattern */ @@ -1206,7 +1001,7 @@ tSCC zAlpha_Pthread_GccName[] = * File name selection pattern */ tSCC zAlpha_Pthread_GccList[] = - "|pthread.h|"; + "pthread.h\0"; /* * Machine/OS name selection pattern */ @@ -1246,7 +1041,7 @@ tSCC zAlpha_Pthread_InitName[] = * File name selection pattern */ tSCC zAlpha_Pthread_InitList[] = - "|pthread.h|"; + "pthread.h\0"; /* * Machine/OS name selection pattern */ @@ -1267,7 +1062,7 @@ static tTestDesc aAlpha_Pthread_InitTests[] = { /* * Fix Command Arguments for Alpha_Pthread_Init */ -static const char* apzAlpha_Pthread_InitPatch[] = { "sed", +static const char* apzAlpha_Pthread_InitPatch[] = { sed_cmd_z, "-e", "s@MVALID\\(.*\\)A}@MVALID\\1A, 0, 0, 0, 0, 0, 0 }@\n\ s@MVALID\\(.*\\)_}@MVALID\\1_, 0, 0, 0, 0 }@\n\ s@CVALID\\(.*\\)A}@CVALID\\1A, 0, 0, 0, 0 }@\n\ @@ -1287,7 +1082,7 @@ tSCC zAlpha_SbrkName[] = * File name selection pattern */ tSCC zAlpha_SbrkList[] = - "|unistd.h|"; + "unistd.h\0"; /* * Machine/OS name selection pattern */ @@ -1322,7 +1117,7 @@ tSCC zAlpha_WcharName[] = * File name selection pattern */ tSCC zAlpha_WcharList[] = - "|wchar.h|"; + "wchar.h\0"; /* * Machine/OS name selection pattern */ @@ -1343,7 +1138,7 @@ static tTestDesc aAlpha_WcharTests[] = { /* * Fix Command Arguments for Alpha_Wchar */ -static const char* apzAlpha_WcharPatch[] = { "sed", +static const char* apzAlpha_WcharPatch[] = { sed_cmd_z, "-e", "s@#define wcstok wcstok_r@extern wchar_t *wcstok __((wchar_t *, const wchar_t *, wchar_t **)) __asm__(\"wcstok_r\");@", "-e", "s@#define wcsftime __wcsftime_isoc@extern size_t wcsftime __((wchar_t *, size_t, const wchar_t *, const struct tm *)) __asm__(\"__wcsftime_isoc\");@", (char*)NULL }; @@ -1359,7 +1154,7 @@ tSCC zAvoid_Bool_DefineName[] = * File name selection pattern */ tSCC zAvoid_Bool_DefineList[] = - "|curses.h|curses_colr/curses.h|term.h|tinfo.h|"; + "curses.h\0curses_colr/curses.h\0term.h\0tinfo.h\0"; /* * Machine/OS name selection pattern */ @@ -1404,7 +1199,7 @@ tSCC zAvoid_Bool_TypeName[] = * File name selection pattern */ tSCC zAvoid_Bool_TypeList[] = - "|curses.h|curses_colr/curses.h|term.h|tinfo.h|"; + "curses.h\0curses_colr/curses.h\0term.h\0tinfo.h\0"; /* * Machine/OS name selection pattern */ @@ -1497,7 +1292,7 @@ tSCC zBad_Struct_TermName[] = * File name selection pattern */ tSCC zBad_Struct_TermList[] = - "|curses.h|"; + "curses.h\0"; /* * Machine/OS name selection pattern */ @@ -1532,7 +1327,7 @@ tSCC zBadquoteName[] = * File name selection pattern */ tSCC zBadquoteList[] = - "|sundev/vuid_event.h|"; + "sundev/vuid_event.h\0"; /* * Machine/OS name selection pattern */ @@ -1567,7 +1362,7 @@ tSCC zBroken_Assert_StdioName[] = * File name selection pattern */ tSCC zBroken_Assert_StdioList[] = - "|assert.h|"; + "assert.h\0"; /* * Machine/OS name selection pattern */ @@ -1609,7 +1404,7 @@ tSCC zBroken_Assert_StdlibName[] = * File name selection pattern */ tSCC zBroken_Assert_StdlibList[] = - "|assert.h|"; + "assert.h\0"; /* * Machine/OS name selection pattern */ @@ -1653,7 +1448,7 @@ tSCC zBroken_CabsName[] = * File name selection pattern */ tSCC zBroken_CabsList[] = - "|math.h|architecture/ppc/math.h|architecture/i386/math.h|"; + "math.h\0architecture/*/math.h\0"; /* * Machine/OS name selection pattern */ @@ -1672,10 +1467,9 @@ static tTestDesc aBroken_CabsTests[] = { /* * Fix Command Arguments for Broken_Cabs */ -static const char* apzBroken_CabsPatch[] = { - "format", - "", - "^extern[ \t]+double[ \t]+cabs[ \t]*\\([^\\)]*\\);", +static const char* apzBroken_CabsPatch[] = { sed_cmd_z, + "-e", "s/^extern[ \t]*double[ \t]*cabs[ \t]*([^\\)]*);//", + "-e", "s/^extern[ \t]*long[ \t]*double[ \t]*cabsl[ \t]*([^\\)]*);//", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -1689,7 +1483,7 @@ tSCC zBroken_NanName[] = * File name selection pattern */ tSCC zBroken_NanList[] = - "|architecture/ppc/math.h|architecture/i386/math.h|"; + "architecture/ppc/math.h\0architecture/*/math.h\0"; /* * Machine/OS name selection pattern */ @@ -1731,7 +1525,7 @@ tSCC zBsd_Stdio_Attrs_ConflictName[] = * File name selection pattern */ tSCC zBsd_Stdio_Attrs_ConflictList[] = - "|stdio.h|"; + "stdio.h\0"; /* * Machine/OS name selection pattern */ @@ -1839,7 +1633,7 @@ tSCC zCxx_UnreadyName[] = * File name selection pattern */ tSCC zCxx_UnreadyList[] = - "|sys/mman.h|rpc/types.h|"; + "sys/mman.h\0rpc/types.h\0"; /* * Machine/OS name selection pattern */ @@ -1877,6 +1671,51 @@ extern \"C\" {\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Darwin_Externc fix + */ +tSCC zDarwin_ExterncName[] = + "darwin_externc"; + +/* + * File name selection pattern + */ +tSCC zDarwin_ExterncList[] = + "mach-o/swap.h\0mach/mach_time.h\0mach/mach_traps.h\0mach/message.h\0mach/mig.h\0mach/semaphore.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_ExterncMachs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zDarwin_ExterncBypass0[] = + "extern \"C\""; +tSCC zDarwin_ExterncBypass1[] = + "__BEGIN_DECLS"; + +#define DARWIN_EXTERNC_TEST_CT 2 +static tTestDesc aDarwin_ExterncTests[] = { + { TT_NEGREP, zDarwin_ExterncBypass0, (regex_t*)NULL }, + { TT_NEGREP, zDarwin_ExterncBypass1, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Externc + */ +static const char* apzDarwin_ExterncPatch[] = { + "wrap", + "#ifdef __cplusplus\n\ +extern \"C\" {\n\ +#endif\n", + "#ifdef __cplusplus\n\ +}\n\ +#endif\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Darwin_Gcc4_Breakage fix */ tSCC zDarwin_Gcc4_BreakageName[] = @@ -1886,7 +1725,7 @@ tSCC zDarwin_Gcc4_BreakageName[] = * File name selection pattern */ tSCC zDarwin_Gcc4_BreakageList[] = - "|AvailabilityMacros.h|"; + "AvailabilityMacros.h\0"; /* * Machine/OS name selection pattern */ @@ -1923,7 +1762,7 @@ tSCC zDarwin_Private_ExternName[] = * File name selection pattern */ tSCC zDarwin_Private_ExternList[] = - "|mach-o/dyld.h|"; + "mach-o/dyld.h\0"; /* * Machine/OS name selection pattern */ @@ -1961,7 +1800,7 @@ tSCC zDec_Intern_AsmName[] = * File name selection pattern */ tSCC zDec_Intern_AsmList[] = - "|c_asm.h|"; + "c_asm.h\0"; /* * Machine/OS name selection pattern */ @@ -1972,7 +1811,7 @@ tSCC zDec_Intern_AsmList[] = /* * Fix Command Arguments for Dec_Intern_Asm */ -static const char* apzDec_Intern_AsmPatch[] = { "sed", +static const char* apzDec_Intern_AsmPatch[] = { sed_cmd_z, "-e", "/^[ \t]*float[ \t]*fasm/i\\\n\ #ifdef __DECC\n", "-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n\ @@ -2033,7 +1872,7 @@ tSCC zEcd_CursorName[] = * File name selection pattern */ tSCC zEcd_CursorList[] = - "|sunwindow/win_lock.h|sunwindow/win_cursor.h|"; + "sunwindow/win_lock.h\0sunwindow/win_cursor.h\0"; /* * Machine/OS name selection pattern */ @@ -2068,7 +1907,7 @@ tSCC zException_StructureName[] = * File name selection pattern */ tSCC zException_StructureList[] = - "|math.h|"; + "math.h\0"; /* * Machine/OS name selection pattern */ @@ -2110,7 +1949,7 @@ tSCC zFreebsd_Gcc3_BreakageName[] = * File name selection pattern */ tSCC zFreebsd_Gcc3_BreakageList[] = - "|sys/cdefs.h|"; + "sys/cdefs.h\0"; /* * Machine/OS name selection pattern */ @@ -2154,7 +1993,7 @@ tSCC zFreebsd_Gcc4_BreakageName[] = * File name selection pattern */ tSCC zFreebsd_Gcc4_BreakageList[] = - "|sys/cdefs.h|"; + "sys/cdefs.h\0"; /* * Machine/OS name selection pattern */ @@ -2182,238 +2021,527 @@ static const char* apzFreebsd_Gcc4_BreakagePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Gnu_Types fix + * Description of Glibc_C99_Inline_1 fix */ -tSCC zGnu_TypesName[] = - "gnu_types"; +tSCC zGlibc_C99_Inline_1Name[] = + "glibc_c99_inline_1"; /* * File name selection pattern */ -tSCC zGnu_TypesList[] = - "|sys/types.h|stdlib.h|sys/stdtypes.h|stddef.h|memory.h|unistd.h|"; +tSCC zGlibc_C99_Inline_1List[] = + "features.h\0*/features.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzGnu_TypesMachs[] = { - "*-*-solaris2.1[0-9]*", - (const char*)NULL }; +#define apzGlibc_C99_Inline_1Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zGnu_TypesSelect0[] = - "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zGnu_TypesBypass0[] = - "_GCC_(PTRDIFF|SIZE|WCHAR)_T"; +tSCC zGlibc_C99_Inline_1Select0[] = + "^ *&& !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__$"; -#define GNU_TYPES_TEST_CT 2 -static tTestDesc aGnu_TypesTests[] = { - { TT_NEGREP, zGnu_TypesBypass0, (regex_t*)NULL }, - { TT_EGREP, zGnu_TypesSelect0, (regex_t*)NULL }, }; +#define GLIBC_C99_INLINE_1_TEST_CT 1 +static tTestDesc aGlibc_C99_Inline_1Tests[] = { + { TT_EGREP, zGlibc_C99_Inline_1Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Gnu_Types + * Fix Command Arguments for Glibc_C99_Inline_1 */ -static const char* apzGnu_TypesPatch[] = { - "gnu_type", +static const char* apzGlibc_C99_Inline_1Patch[] = { + "format", + "%0 && (defined __extern_inline || defined __GNUC_GNU_INLINE__)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hp_Inline fix + * Description of Glibc_C99_Inline_1a fix */ -tSCC zHp_InlineName[] = - "hp_inline"; +tSCC zGlibc_C99_Inline_1aName[] = + "glibc_c99_inline_1a"; /* * File name selection pattern */ -tSCC zHp_InlineList[] = - "|sys/spinlock.h|machine/machparam.h|"; +tSCC zGlibc_C99_Inline_1aList[] = + "features.h\0*/features.h\0"; /* * Machine/OS name selection pattern */ -#define apzHp_InlineMachs (const char**)NULL +#define apzGlibc_C99_Inline_1aMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHp_InlineSelect0[] = - "[ \t]*#[ \t]*include[ \t]+\"\\.\\./machine/"; +tSCC zGlibc_C99_Inline_1aSelect0[] = + "(\\) && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__)\n\ +(#[ \t]*define[ \t]*__USE_EXTERN_INLINES[ \t]*1)"; -#define HP_INLINE_TEST_CT 1 -static tTestDesc aHp_InlineTests[] = { - { TT_EGREP, zHp_InlineSelect0, (regex_t*)NULL }, }; +#define GLIBC_C99_INLINE_1A_TEST_CT 1 +static tTestDesc aGlibc_C99_Inline_1aTests[] = { + { TT_EGREP, zGlibc_C99_Inline_1aSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hp_Inline + * Fix Command Arguments for Glibc_C99_Inline_1a */ -static const char* apzHp_InlinePatch[] = { +static const char* apzGlibc_C99_Inline_1aPatch[] = { "format", - "%1", - "([ \t]*#[ \t]*include[ \t]+)\"\\.\\./machine/([a-z]+)\\.h\"", + "%1 && (defined __extern_inline || defined __GNUC_GNU_INLINE__)\n\ +%2", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hp_Sysfile fix + * Description of Glibc_C99_Inline_2 fix */ -tSCC zHp_SysfileName[] = - "hp_sysfile"; +tSCC zGlibc_C99_Inline_2Name[] = + "glibc_c99_inline_2"; /* * File name selection pattern */ -tSCC zHp_SysfileList[] = - "|sys/file.h|"; +tSCC zGlibc_C99_Inline_2List[] = + "sys/stat.h\0*/sys/stat.h\0"; /* * Machine/OS name selection pattern */ -#define apzHp_SysfileMachs (const char**)NULL +#define apzGlibc_C99_Inline_2Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHp_SysfileSelect0[] = - "HPUX_SOURCE"; +tSCC zGlibc_C99_Inline_2Select0[] = + "extern __inline__ int"; -#define HP_SYSFILE_TEST_CT 1 -static tTestDesc aHp_SysfileTests[] = { - { TT_EGREP, zHp_SysfileSelect0, (regex_t*)NULL }, }; +#define GLIBC_C99_INLINE_2_TEST_CT 1 +static tTestDesc aGlibc_C99_Inline_2Tests[] = { + { TT_EGREP, zGlibc_C99_Inline_2Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hp_Sysfile + * Fix Command Arguments for Glibc_C99_Inline_2 */ -static const char* apzHp_SysfilePatch[] = { - "format", - "(struct file *, ...)", - "\\(\\.\\.\\.\\)", +static const char* apzGlibc_C99_Inline_2Patch[] = { sed_cmd_z, + "-e", "s/extern int \\(stat\\|lstat\\|fstat\\|mknod\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ +extern\\\n\ +#endif\\\n\ +__inline__ int \\1/", + "-e", "s/extern int __REDIRECT\\(_NTH\\|\\) (\\(stat\\|lstat\\|fstat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ +extern\\\n\ +#endif\\\n\ +__inline__ int __REDIRECT\\1 (\\2/", + "-e", "s/^extern __inline__ int/#ifdef __GNUC_GNU_INLINE__\\\n\ +extern\\\n\ +#endif\\\n\ +__inline__ int/", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux10_Cpp_Pow_Inline fix + * Description of Glibc_C99_Inline_3 fix */ -tSCC zHpux10_Cpp_Pow_InlineName[] = - "hpux10_cpp_pow_inline"; +tSCC zGlibc_C99_Inline_3Name[] = + "glibc_c99_inline_3"; /* * File name selection pattern */ -tSCC zHpux10_Cpp_Pow_InlineList[] = - "|fixinc-test-limits.h|math.h|"; +tSCC zGlibc_C99_Inline_3List[] = + "bits/string2.h\0*/bits/string2.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux10_Cpp_Pow_InlineMachs (const char**)NULL +#define apzGlibc_C99_Inline_3Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux10_Cpp_Pow_InlineSelect0[] = - "^# +ifdef +__cplusplus\n\ - +\\}\n\ - +inline +double +pow\\(double +__d,int +__expon\\) +\\{\n\ -[ \t]+return +pow\\(__d,\\(double\\)__expon\\);\n\ - +\\}\n\ - +extern +\"C\" +\\{\n\ -#else\n\ -# +endif"; +tSCC zGlibc_C99_Inline_3Select0[] = + "extern __inline"; -#define HPUX10_CPP_POW_INLINE_TEST_CT 1 -static tTestDesc aHpux10_Cpp_Pow_InlineTests[] = { - { TT_EGREP, zHpux10_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, }; +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zGlibc_C99_Inline_3Bypass0[] = + "__extern_inline|__GNU_STDC_INLINE__"; + +#define GLIBC_C99_INLINE_3_TEST_CT 2 +static tTestDesc aGlibc_C99_Inline_3Tests[] = { + { TT_NEGREP, zGlibc_C99_Inline_3Bypass0, (regex_t*)NULL }, + { TT_EGREP, zGlibc_C99_Inline_3Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux10_Cpp_Pow_Inline + * Fix Command Arguments for Glibc_C99_Inline_3 */ -static const char* apzHpux10_Cpp_Pow_InlinePatch[] = { +static const char* apzGlibc_C99_Inline_3Patch[] = { "format", - "", + "# if defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)", + "^# ifdef __cplusplus$", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux11_Cpp_Pow_Inline fix + * Description of Glibc_C99_Inline_4 fix */ -tSCC zHpux11_Cpp_Pow_InlineName[] = - "hpux11_cpp_pow_inline"; +tSCC zGlibc_C99_Inline_4Name[] = + "glibc_c99_inline_4"; /* * File name selection pattern */ -tSCC zHpux11_Cpp_Pow_InlineList[] = - "|math.h|"; +tSCC zGlibc_C99_Inline_4List[] = + "sys/sysmacros.h\0*/sys/sysmacros.h\0wchar.h\0*/wchar.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux11_Cpp_Pow_InlineMachs (const char**)NULL +#define apzGlibc_C99_Inline_4Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux11_Cpp_Pow_InlineSelect0[] = - " +inline double pow\\(double d,int expon\\) \\{\n\ - +return pow\\(d, \\(double\\)expon\\);\n\ - +\\}\n"; +tSCC zGlibc_C99_Inline_4Select0[] = + "(^| )extern __inline"; -#define HPUX11_CPP_POW_INLINE_TEST_CT 1 -static tTestDesc aHpux11_Cpp_Pow_InlineTests[] = { - { TT_EGREP, zHpux11_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, }; +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zGlibc_C99_Inline_4Bypass0[] = + "__extern_inline|__gnu_inline__"; + +#define GLIBC_C99_INLINE_4_TEST_CT 2 +static tTestDesc aGlibc_C99_Inline_4Tests[] = { + { TT_NEGREP, zGlibc_C99_Inline_4Bypass0, (regex_t*)NULL }, + { TT_EGREP, zGlibc_C99_Inline_4Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux11_Cpp_Pow_Inline + * Fix Command Arguments for Glibc_C99_Inline_4 */ -static const char* apzHpux11_Cpp_Pow_InlinePatch[] = { +static const char* apzGlibc_C99_Inline_4Patch[] = { "format", - "", + "%0 __attribute__ ((__gnu_inline__))", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux10_Ctype_Declarations1 fix + * Description of Glibc_Mutex_Init fix */ -tSCC zHpux10_Ctype_Declarations1Name[] = - "hpux10_ctype_declarations1"; +tSCC zGlibc_Mutex_InitName[] = + "glibc_mutex_init"; /* * File name selection pattern */ -tSCC zHpux10_Ctype_Declarations1List[] = - "|ctype.h|"; +tSCC zGlibc_Mutex_InitList[] = + "pthread.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux10_Ctype_Declarations1Machs (const char**)NULL +#define apzGlibc_Mutex_InitMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux10_Ctype_Declarations1Select0[] = - "^#[ \t]*define _toupper\\(__c\\)[ \t]*__toupper\\(__c\\)"; +tSCC zGlibc_Mutex_InitSelect0[] = + "\\{ *\\{ *0, *\\} *\\}"; + +#define GLIBC_MUTEX_INIT_TEST_CT 1 +static tTestDesc aGlibc_Mutex_InitTests[] = { + { TT_EGREP, zGlibc_Mutex_InitSelect0, (regex_t*)NULL }, }; /* - * content bypass pattern - skip fix if pattern found + * Fix Command Arguments for Glibc_Mutex_Init */ -tSCC zHpux10_Ctype_Declarations1Bypass0[] = - "^[ \t]*extern[ \t]*int[ \t]*__tolower[ \t]*\\("; +static const char* apzGlibc_Mutex_InitPatch[] = { sed_cmd_z, + "-e", "/define[ \t]\\+PTHREAD_MUTEX_INITIALIZER[ \t]*\\\\/{\n\ +N\n\ +s/{ { 0, } }/{ { 0, 0, 0, 0, 0, 0 } }/\n\ +}", + "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\|ERRORCHECK\\|ADAPTIVE\\)_NP\\) }/{ \\1, 0 }/", + "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\|ERRORCHECK\\|ADAPTIVE\\)_NP\\) }/{ \\1, 0, 0 }/", + "-e", "/define[ \t]\\+PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\/N;s/^[ \t]*#[ \t]*\\(define[ \t]\\+PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\\\)\\n[ \t]*{ { 0, } }/# if __WORDSIZE == 64\\n# \\1\\n { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }\\n# else\\n# \\1\\n { { 0, 0, 0, 0, 0, 0, 0, 0 } }\\n# endif/", + "-e", "s/{ \\(0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP\\) }/{ \\1, 0 }/", + "-e", "/define[ \t]\\+PTHREAD_COND_INITIALIZER/s/{ { 0, } }/{ { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }/", + (char*)NULL }; -#define HPUX10_CTYPE_DECLARATIONS1_TEST_CT 2 -static tTestDesc aHpux10_Ctype_Declarations1Tests[] = { - { TT_NEGREP, zHpux10_Ctype_Declarations1Bypass0, (regex_t*)NULL }, - { TT_EGREP, zHpux10_Ctype_Declarations1Select0, (regex_t*)NULL }, }; +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Gnu_Types fix + */ +tSCC zGnu_TypesName[] = + "gnu_types"; /* - * Fix Command Arguments for Hpux10_Ctype_Declarations1 + * File name selection pattern */ -static const char* apzHpux10_Ctype_Declarations1Patch[] = { - "format", - "#ifdef _PROTOTYPES\n\ +tSCC zGnu_TypesList[] = + "sys/types.h\0stdlib.h\0sys/stdtypes.h\0stddef.h\0memory.h\0unistd.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzGnu_TypesMachs[] = { + "*-*-solaris2.1[0-9]*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zGnu_TypesSelect0[] = + "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zGnu_TypesBypass0[] = + "_GCC_(PTRDIFF|SIZE|WCHAR)_T"; + +#define GNU_TYPES_TEST_CT 2 +static tTestDesc aGnu_TypesTests[] = { + { TT_NEGREP, zGnu_TypesBypass0, (regex_t*)NULL }, + { TT_EGREP, zGnu_TypesSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Gnu_Types + */ +static const char* apzGnu_TypesPatch[] = { + "gnu_type", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hp_Inline fix + */ +tSCC zHp_InlineName[] = + "hp_inline"; + +/* + * File name selection pattern + */ +tSCC zHp_InlineList[] = + "sys/spinlock.h\0machine/machparam.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzHp_InlineMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHp_InlineSelect0[] = + "[ \t]*#[ \t]*include[ \t]+\"\\.\\./machine/"; + +#define HP_INLINE_TEST_CT 1 +static tTestDesc aHp_InlineTests[] = { + { TT_EGREP, zHp_InlineSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hp_Inline + */ +static const char* apzHp_InlinePatch[] = { + "format", + "%1", + "([ \t]*#[ \t]*include[ \t]+)\"\\.\\./machine/([a-z]+)\\.h\"", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hp_Sysfile fix + */ +tSCC zHp_SysfileName[] = + "hp_sysfile"; + +/* + * File name selection pattern + */ +tSCC zHp_SysfileList[] = + "sys/file.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzHp_SysfileMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHp_SysfileSelect0[] = + "HPUX_SOURCE"; + +#define HP_SYSFILE_TEST_CT 1 +static tTestDesc aHp_SysfileTests[] = { + { TT_EGREP, zHp_SysfileSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hp_Sysfile + */ +static const char* apzHp_SysfilePatch[] = { + "format", + "(struct file *, ...)", + "\\(\\.\\.\\.\\)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hppa_Hpux_Fp_Macros fix + */ +tSCC zHppa_Hpux_Fp_MacrosName[] = + "hppa_hpux_fp_macros"; + +/* + * File name selection pattern + */ +tSCC zHppa_Hpux_Fp_MacrosList[] = + "math.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHppa_Hpux_Fp_MacrosMachs[] = { + "hppa*-hp-hpux11*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHppa_Hpux_Fp_MacrosSelect0[] = + "#[ \t]*define[ \t]*FP_NORMAL.*\n\ +#[ \t]*define[ \t]*FP_ZERO.*\n\ +#[ \t]*define[ \t]*FP_INFINITE.*\n\ +#[ \t]*define[ \t]*FP_SUBNORMAL.*\n\ +#[ \t]*define[ \t]*FP_NAN.*\n"; + +#define HPPA_HPUX_FP_MACROS_TEST_CT 1 +static tTestDesc aHppa_Hpux_Fp_MacrosTests[] = { + { TT_EGREP, zHppa_Hpux_Fp_MacrosSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hppa_Hpux_Fp_Macros + */ +static const char* apzHppa_Hpux_Fp_MacrosPatch[] = { + "format", + "#endif /* _INCLUDE_HPUX_SOURCE */\n\n\ +#if defined(_INCLUDE_HPUX_SOURCE) || \\\n\ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))\n\ +%0#endif\n\n\ +#ifdef _INCLUDE_HPUX_SOURCE\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux10_Cpp_Pow_Inline fix + */ +tSCC zHpux10_Cpp_Pow_InlineName[] = + "hpux10_cpp_pow_inline"; + +/* + * File name selection pattern + */ +tSCC zHpux10_Cpp_Pow_InlineList[] = + "fixinc-test-limits.h\0math.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzHpux10_Cpp_Pow_InlineMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux10_Cpp_Pow_InlineSelect0[] = + "^# +ifdef +__cplusplus\n\ + +\\}\n\ + +inline +double +pow\\(double +__d,int +__expon\\) +\\{\n\ +[ \t]+return +pow\\(__d,\\(double\\)__expon\\);\n\ + +\\}\n\ + +extern +\"C\" +\\{\n\ +#else\n\ +# +endif"; + +#define HPUX10_CPP_POW_INLINE_TEST_CT 1 +static tTestDesc aHpux10_Cpp_Pow_InlineTests[] = { + { TT_EGREP, zHpux10_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux10_Cpp_Pow_Inline + */ +static const char* apzHpux10_Cpp_Pow_InlinePatch[] = { + "format", + "", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux11_Cpp_Pow_Inline fix + */ +tSCC zHpux11_Cpp_Pow_InlineName[] = + "hpux11_cpp_pow_inline"; + +/* + * File name selection pattern + */ +tSCC zHpux11_Cpp_Pow_InlineList[] = + "math.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzHpux11_Cpp_Pow_InlineMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux11_Cpp_Pow_InlineSelect0[] = + " +inline double pow\\(double d,int expon\\) \\{\n\ + +return pow\\(d, \\(double\\)expon\\);\n\ + +\\}\n"; + +#define HPUX11_CPP_POW_INLINE_TEST_CT 1 +static tTestDesc aHpux11_Cpp_Pow_InlineTests[] = { + { TT_EGREP, zHpux11_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux11_Cpp_Pow_Inline + */ +static const char* apzHpux11_Cpp_Pow_InlinePatch[] = { + "format", + "", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux10_Ctype_Declarations1 fix + */ +tSCC zHpux10_Ctype_Declarations1Name[] = + "hpux10_ctype_declarations1"; + +/* + * File name selection pattern + */ +tSCC zHpux10_Ctype_Declarations1List[] = + "ctype.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzHpux10_Ctype_Declarations1Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux10_Ctype_Declarations1Select0[] = + "^#[ \t]*define _toupper\\(__c\\)[ \t]*__toupper\\(__c\\)"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zHpux10_Ctype_Declarations1Bypass0[] = + "^[ \t]*extern[ \t]*int[ \t]*__tolower[ \t]*\\("; + +#define HPUX10_CTYPE_DECLARATIONS1_TEST_CT 2 +static tTestDesc aHpux10_Ctype_Declarations1Tests[] = { + { TT_NEGREP, zHpux10_Ctype_Declarations1Bypass0, (regex_t*)NULL }, + { TT_EGREP, zHpux10_Ctype_Declarations1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux10_Ctype_Declarations1 + */ +static const char* apzHpux10_Ctype_Declarations1Patch[] = { + "format", + "#ifdef _PROTOTYPES\n\ extern int __tolower(int);\n\ extern int __toupper(int);\n\ #else /* NOT _PROTOTYPES */\n\ @@ -2434,7 +2562,7 @@ tSCC zHpux10_Ctype_Declarations2Name[] = * File name selection pattern */ tSCC zHpux10_Ctype_Declarations2List[] = - "|ctype.h|"; + "ctype.h\0"; /* * Machine/OS name selection pattern */ @@ -2501,7 +2629,7 @@ tSCC zHpux10_Stdio_DeclarationsName[] = * File name selection pattern */ tSCC zHpux10_Stdio_DeclarationsList[] = - "|stdio.h|"; + "stdio.h\0"; /* * Machine/OS name selection pattern */ @@ -2550,7 +2678,7 @@ tSCC zHpux11_AbsName[] = * File name selection pattern */ tSCC zHpux11_AbsList[] = - "|stdlib.h|"; + "stdlib.h\0"; /* * Machine/OS name selection pattern */ @@ -2587,7 +2715,7 @@ tSCC zHpux11_FabsfName[] = * File name selection pattern */ tSCC zHpux11_FabsfList[] = - "|math.h|"; + "math.h\0"; /* * Machine/OS name selection pattern */ @@ -2622,43 +2750,80 @@ static const char* apzHpux11_FabsfPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux11_Size_T fix + * Description of Hpux11_Pthread_Const fix */ -tSCC zHpux11_Size_TName[] = - "hpux11_size_t"; +tSCC zHpux11_Pthread_ConstName[] = + "hpux11_pthread_const"; /* * File name selection pattern */ -#define zHpux11_Size_TList (char*)NULL +tSCC zHpux11_Pthread_ConstList[] = + "sys/pthread.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzHpux11_Size_TMachs[] = { - "*-hp-hpux11*", +tSCC* apzHpux11_Pthread_ConstMachs[] = { + "*-hp-hpux11.[0-3]*", (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zHpux11_Size_TSelect0[] = - "__size_t"; +tSCC zHpux11_Pthread_ConstSelect0[] = + "^#define[ \t]*__POINTER_SET[ \t]*\\(\\(void \\*\\) 1LL\\)"; -#define HPUX11_SIZE_T_TEST_CT 1 -static tTestDesc aHpux11_Size_TTests[] = { - { TT_EGREP, zHpux11_Size_TSelect0, (regex_t*)NULL }, }; +#define HPUX11_PTHREAD_CONST_TEST_CT 1 +static tTestDesc aHpux11_Pthread_ConstTests[] = { + { TT_EGREP, zHpux11_Pthread_ConstSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux11_Size_T + * Fix Command Arguments for Hpux11_Pthread_Const */ -static const char* apzHpux11_Size_TPatch[] = { +static const char* apzHpux11_Pthread_ConstPatch[] = { "format", - "_hpux_size_t", + "#define __POINTER_SET\t\t((void *) 1L)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux11_Snprintf fix + * Description of Hpux11_Size_T fix + */ +tSCC zHpux11_Size_TName[] = + "hpux11_size_t"; + +/* + * File name selection pattern + */ +#define zHpux11_Size_TList (char*)NULL +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux11_Size_TMachs[] = { + "*-hp-hpux11*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux11_Size_TSelect0[] = + "__size_t"; + +#define HPUX11_SIZE_T_TEST_CT 1 +static tTestDesc aHpux11_Size_TTests[] = { + { TT_EGREP, zHpux11_Size_TSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux11_Size_T + */ +static const char* apzHpux11_Size_TPatch[] = { + "format", + "_hpux_size_t", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux11_Snprintf fix */ tSCC zHpux11_SnprintfName[] = "hpux11_snprintf"; @@ -2667,7 +2832,7 @@ tSCC zHpux11_SnprintfName[] = * File name selection pattern */ tSCC zHpux11_SnprintfList[] = - "|stdio.h|"; + "stdio.h\0"; /* * Machine/OS name selection pattern */ @@ -2702,7 +2867,7 @@ tSCC zHpux11_Uint32_CName[] = * File name selection pattern */ tSCC zHpux11_Uint32_CList[] = - "|inttypes.h|"; + "inttypes.h\0"; /* * Machine/OS name selection pattern */ @@ -2737,7 +2902,7 @@ tSCC zHpux11_VsnprintfName[] = * File name selection pattern */ tSCC zHpux11_VsnprintfList[] = - "|stdio.h|"; + "stdio.h\0"; /* * Machine/OS name selection pattern */ @@ -2772,7 +2937,7 @@ tSCC zHpux8_Bogus_InlinesName[] = * File name selection pattern */ tSCC zHpux8_Bogus_InlinesList[] = - "|math.h|"; + "math.h\0"; /* * Machine/OS name selection pattern */ @@ -2798,7 +2963,7 @@ static tTestDesc aHpux8_Bogus_InlinesTests[] = { /* * Fix Command Arguments for Hpux8_Bogus_Inlines */ -static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed", +static const char* apzHpux8_Bogus_InlinesPatch[] = { sed_cmd_z, "-e", "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@", "-e", "s@inline double abs(double [a-z][a-z]*) {.*}@@", "-e", "s@inline int sqr(int [a-z][a-z]*) {.*}@@", @@ -2816,7 +2981,7 @@ tSCC zHpux_Ctype_MacrosName[] = * File name selection pattern */ tSCC zHpux_Ctype_MacrosList[] = - "|ctype.h|"; + "ctype.h\0"; /* * Machine/OS name selection pattern */ @@ -2851,7 +3016,7 @@ tSCC zHpux_HtonlName[] = * File name selection pattern */ tSCC zHpux_HtonlList[] = - "|netinet/in.h|"; + "netinet/in.h\0"; /* * Machine/OS name selection pattern */ @@ -2891,7 +3056,7 @@ tSCC zHpux_Long_DoubleName[] = * File name selection pattern */ tSCC zHpux_Long_DoubleList[] = - "|stdlib.h|"; + "stdlib.h\0"; /* * Machine/OS name selection pattern */ @@ -2917,7 +3082,7 @@ static tTestDesc aHpux_Long_DoubleTests[] = { /* * Fix Command Arguments for Hpux_Long_Double */ -static const char* apzHpux_Long_DoublePatch[] = { "sed", +static const char* apzHpux_Long_DoublePatch[] = { sed_cmd_z, "-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D", "-e", "s/long_double/long double/g", (char*)NULL }; @@ -2933,7 +3098,7 @@ tSCC zHpux_SystimeName[] = * File name selection pattern */ tSCC zHpux_SystimeList[] = - "|sys/time.h|"; + "sys/time.h\0"; /* * Machine/OS name selection pattern */ @@ -2968,7 +3133,7 @@ tSCC zHpux_Spu_InfoName[] = * File name selection pattern */ tSCC zHpux_Spu_InfoList[] = - "|ia64/sys/getppdp.h|"; + "ia64/sys/getppdp.h\0"; /* * Machine/OS name selection pattern */ @@ -2998,6 +3163,84 @@ static const char* apzHpux_Spu_InfoPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hpux11_Extern_Sendfile fix + */ +tSCC zHpux11_Extern_SendfileName[] = + "hpux11_extern_sendfile"; + +/* + * File name selection pattern + */ +tSCC zHpux11_Extern_SendfileList[] = + "sys/socket.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux11_Extern_SendfileMachs[] = { + "*-hp-hpux11.[12]*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux11_Extern_SendfileSelect0[] = + "^[ \t]*extern sbsize_t sendfile.*\n\ +.*, int\\)\\);\n"; + +#define HPUX11_EXTERN_SENDFILE_TEST_CT 1 +static tTestDesc aHpux11_Extern_SendfileTests[] = { + { TT_EGREP, zHpux11_Extern_SendfileSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux11_Extern_Sendfile + */ +static const char* apzHpux11_Extern_SendfilePatch[] = { + "format", + "#ifndef _APP32_64BIT_OFF_T\n\ +%0#endif\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux11_Extern_Sendpath fix + */ +tSCC zHpux11_Extern_SendpathName[] = + "hpux11_extern_sendpath"; + +/* + * File name selection pattern + */ +tSCC zHpux11_Extern_SendpathList[] = + "sys/socket.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux11_Extern_SendpathMachs[] = { + "*-hp-hpux11.[12]*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux11_Extern_SendpathSelect0[] = + "^[ \t]*extern sbsize_t sendpath.*\n\ +.*, int\\)\\);\n"; + +#define HPUX11_EXTERN_SENDPATH_TEST_CT 1 +static tTestDesc aHpux11_Extern_SendpathTests[] = { + { TT_EGREP, zHpux11_Extern_SendpathSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux11_Extern_Sendpath + */ +static const char* apzHpux11_Extern_SendpathPatch[] = { + "format", + "#ifndef _APP32_64BIT_OFF_T\n\ +%0#endif\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Hpux_Extern_Errno fix */ tSCC zHpux_Extern_ErrnoName[] = @@ -3007,7 +3250,7 @@ tSCC zHpux_Extern_ErrnoName[] = * File name selection pattern */ tSCC zHpux_Extern_ErrnoList[] = - "|errno.h|"; + "errno.h\0"; /* * Machine/OS name selection pattern */ @@ -3042,6 +3285,46 @@ extern \"C\" {\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hpux_Pthread_Initializers fix + */ +tSCC zHpux_Pthread_InitializersName[] = + "hpux_pthread_initializers"; + +/* + * File name selection pattern + */ +tSCC zHpux_Pthread_InitializersList[] = + "sys/pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux_Pthread_InitializersMachs[] = { + "*-hp-hpux11.[0-3]*", + (const char*)NULL }; +#define HPUX_PTHREAD_INITIALIZERS_TEST_CT 0 +#define aHpux_Pthread_InitializersTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Hpux_Pthread_Initializers + */ +static const char* apzHpux_Pthread_InitializersPatch[] = { sed_cmd_z, + "-e", "s@^[ \t]*1, 1, 1, 1,[ \t]*\\\\@\t{ 1, 1, 1, 1 },\t\t\t\t\t\t\t\\\\@", + "-e", "s@^[ \t]*1,[ \t]*\\\\@\t{ 1, 0 }@", + "-e", "/^[ \t]*0$/d", + "-e", "s@__PTHREAD_MUTEX_VALID, 0@{ __PTHREAD_MUTEX_VALID, 0 }@", + "-e", "s@^[ \t]*0, 0, -1, 0,[ \t]*\\\\@\t{ 0, 0, -1, 0 },\t\t\t\t\t\t\\\\@", + "-e", "s@0, __LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\@{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@", + "-e", "s@^[ \t]*__LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\@\t{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@", + "-e", "s@^[ \t]*0, 0[ \t]*\\\\@\t{ 0, 0 }\t\t\t\t\t\t\t\\\\@", + "-e", "s@__PTHREAD_COND_VALID, 0@{ __PTHREAD_COND_VALID, 0 }@", + "-e", "s@__LWP_COND_VALID, 0,[ \t]*\\\\@{ __LWP_COND_VALID, 0 },\t\t\t\t\t\\\\@", + "-e", "s@__PTHREAD_RWLOCK_VALID, 0@{ __PTHREAD_RWLOCK_VALID, 0 }@", + "-e", "s@__LWP_RWLOCK_VALID, 0,[ \t]*\\\\@{ __LWP_RWLOCK_VALID, 0 },\t\t\t\t\t\\\\@", + "-e", "s@^[ \t]*0, 0, 0, 0, 0, 0, 0[ \t]*\\\\@\t{ 0, 0, 0, 0, 0 }, { 0, 0}\t\t\t\t\t\\\\@", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Huge_Val_Hex fix */ tSCC zHuge_Val_HexName[] = @@ -3051,7 +3334,7 @@ tSCC zHuge_Val_HexName[] = * File name selection pattern */ tSCC zHuge_Val_HexList[] = - "|bits/huge_val.h|"; + "bits/huge_val.h\0"; /* * Machine/OS name selection pattern */ @@ -3093,7 +3376,7 @@ tSCC zHuge_Valf_HexName[] = * File name selection pattern */ tSCC zHuge_Valf_HexList[] = - "|bits/huge_val.h|"; + "bits/huge_val.h\0"; /* * Machine/OS name selection pattern */ @@ -3135,7 +3418,7 @@ tSCC zHuge_Vall_HexName[] = * File name selection pattern */ tSCC zHuge_Vall_HexList[] = - "|bits/huge_val.h|"; + "bits/huge_val.h\0"; /* * Machine/OS name selection pattern */ @@ -3177,7 +3460,7 @@ tSCC zInt_Abort_Free_And_ExitName[] = * File name selection pattern */ tSCC zInt_Abort_Free_And_ExitList[] = - "|stdlib.h|"; + "stdlib.h\0"; /* * Machine/OS name selection pattern */ @@ -3287,7 +3570,7 @@ tSCC zIp_Missing_SemiName[] = * File name selection pattern */ tSCC zIp_Missing_SemiList[] = - "|netinet/ip.h|"; + "netinet/ip.h\0"; /* * Machine/OS name selection pattern */ @@ -3306,7 +3589,7 @@ static tTestDesc aIp_Missing_SemiTests[] = { /* * Fix Command Arguments for Ip_Missing_Semi */ -static const char* apzIp_Missing_SemiPatch[] = { "sed", +static const char* apzIp_Missing_SemiPatch[] = { sed_cmd_z, "-e", "/^struct/,/^};/s/}$/};/", (char*)NULL }; @@ -3321,7 +3604,7 @@ tSCC zIrix___RestrictName[] = * File name selection pattern */ tSCC zIrix___RestrictList[] = - "|internal/sgimacros.h|"; + "internal/sgimacros.h\0"; /* * Machine/OS name selection pattern */ @@ -3361,7 +3644,7 @@ tSCC zIrix___Generic1Name[] = * File name selection pattern */ tSCC zIrix___Generic1List[] = - "|internal/math_core.h|"; + "internal/math_core.h\0"; /* * Machine/OS name selection pattern */ @@ -3403,7 +3686,7 @@ tSCC zIrix___Generic2Name[] = * File name selection pattern */ tSCC zIrix___Generic2List[] = - "|internal/math_core.h|"; + "internal/math_core.h\0"; /* * Machine/OS name selection pattern */ @@ -3443,7 +3726,7 @@ tSCC zIrix_Asm_ApostropheName[] = * File name selection pattern */ tSCC zIrix_Asm_ApostropheList[] = - "|sys/asm.h|"; + "sys/asm.h\0"; /* * Machine/OS name selection pattern */ @@ -3479,7 +3762,7 @@ tSCC zIrix_Limits_ConstName[] = * File name selection pattern */ tSCC zIrix_Limits_ConstList[] = - "|fixinc-test-limits.h|limits.h|"; + "fixinc-test-limits.h\0limits.h\0"; /* * Machine/OS name selection pattern */ @@ -3514,7 +3797,7 @@ tSCC zIrix_Socklen_TName[] = * File name selection pattern */ tSCC zIrix_Socklen_TList[] = - "|sys/socket.h|"; + "sys/socket.h\0"; /* * Machine/OS name selection pattern */ @@ -3547,6 +3830,45 @@ typedef int socklen_t;\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Irix_Stdint_C99 fix + */ +tSCC zIrix_Stdint_C99Name[] = + "irix_stdint_c99"; + +/* + * File name selection pattern + */ +tSCC zIrix_Stdint_C99List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzIrix_Stdint_C99Machs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zIrix_Stdint_C99Select0[] = + "(#ifndef __c99\n\ +)(#error This header file is to be used only for c99 mode compilations)"; + +#define IRIX_STDINT_C99_TEST_CT 1 +static tTestDesc aIrix_Stdint_C99Tests[] = { + { TT_EGREP, zIrix_Stdint_C99Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Irix_Stdint_C99 + */ +static const char* apzIrix_Stdint_C99Patch[] = { + "format", + "#if 0\n\ +%2", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Irix_Stdio_Va_List fix */ tSCC zIrix_Stdio_Va_ListName[] = @@ -3556,7 +3878,7 @@ tSCC zIrix_Stdio_Va_ListName[] = * File name selection pattern */ tSCC zIrix_Stdio_Va_ListList[] = - "|stdio.h|internal/stdio_core.h|"; + "stdio.h\0internal/stdio_core.h\0"; /* * Machine/OS name selection pattern */ @@ -3591,7 +3913,7 @@ tSCC zIrix_WcsftimeName[] = * File name selection pattern */ tSCC zIrix_WcsftimeList[] = - "|internal/wchar_core.h|"; + "internal/wchar_core.h\0"; /* * Machine/OS name selection pattern */ @@ -3630,7 +3952,7 @@ tSCC zIsc_FmodName[] = * File name selection pattern */ tSCC zIsc_FmodList[] = - "|math.h|"; + "math.h\0"; /* * Machine/OS name selection pattern */ @@ -3665,7 +3987,7 @@ tSCC zIsc_Omits_With_StdcName[] = * File name selection pattern */ tSCC zIsc_Omits_With_StdcList[] = - "|stdio.h|math.h|ctype.h|sys/limits.h|sys/fcntl.h|sys/dirent.h|"; + "stdio.h\0math.h\0ctype.h\0sys/limits.h\0sys/fcntl.h\0sys/dirent.h\0"; /* * Machine/OS name selection pattern */ @@ -3700,7 +4022,7 @@ tSCC zKandr_ConcatName[] = * File name selection pattern */ tSCC zKandr_ConcatList[] = - "|sparc/asm_linkage.h|sun3/asm_linkage.h|sun3x/asm_linkage.h|sun4/asm_linkage.h|sun4c/asm_linkage.h|sun4m/asm_linkage.h|sun4c/debug/asm_linkage.h|sun4m/debug/asm_linkage.h|arm/as_support.h|arm/mc_type.h|arm/xcb.h|dev/chardefmac.h|dev/ps_irq.h|dev/screen.h|dev/scsi.h|sys/tty.h|Xm.acorn/XmP.h|bsd43/bsd43_.h|"; + "sparc/asm_linkage.h\0sun*/asm_linkage.h\0arm/as_support.h\0arm/mc_type.h\0arm/xcb.h\0dev/chardefmac.h\0dev/ps_irq.h\0dev/screen.h\0dev/scsi.h\0sys/tty.h\0Xm.acorn/XmP.h\0bsd43/bsd43_.h\0"; /* * Machine/OS name selection pattern */ @@ -3726,91 +4048,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|"; -/* - * 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|string.h|"; -/* - * 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[] = @@ -3820,7 +4057,7 @@ tSCC zLinux_Ia64_UcontextName[] = * File name selection pattern */ tSCC zLinux_Ia64_UcontextList[] = - "|sys/ucontext.h|"; + "sys/ucontext.h\0"; /* * Machine/OS name selection pattern */ @@ -3857,7 +4094,7 @@ tSCC zLynxos_No_Warning_In_Sys_Time_HName[] = * File name selection pattern */ tSCC zLynxos_No_Warning_In_Sys_Time_HList[] = - "|sys/time.h|"; + "sys/time.h\0"; /* * Machine/OS name selection pattern */ @@ -3892,7 +4129,7 @@ tSCC zLynxos_Missing_PutenvName[] = * File name selection pattern */ tSCC zLynxos_Missing_PutenvList[] = - "|stdlib.h|"; + "stdlib.h\0"; /* * Machine/OS name selection pattern */ @@ -4012,7 +4249,7 @@ tSCC zMath_ExceptionName[] = * File name selection pattern */ tSCC zMath_ExceptionList[] = - "|math.h|"; + "math.h\0"; /* * Machine/OS name selection pattern */ @@ -4059,7 +4296,7 @@ tSCC zMath_Huge_Val_From_Dbl_MaxName[] = * File name selection pattern */ tSCC zMath_Huge_Val_From_Dbl_MaxList[] = - "|math.h|"; + "math.h\0"; /* * Machine/OS name selection pattern */ @@ -4104,7 +4341,7 @@ tSCC zNested_Auth_DesName[] = * File name selection pattern */ tSCC zNested_Auth_DesList[] = - "|rpc/rpc.h|"; + "rpc/rpc.h\0"; /* * Machine/OS name selection pattern */ @@ -4130,74 +4367,119 @@ static const char* apzNested_Auth_DesPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Nested_Motorola fix + * Description of Nested_Sys_Limits fix + */ +tSCC zNested_Sys_LimitsName[] = + "nested_sys_limits"; + +/* + * File name selection pattern + */ +tSCC zNested_Sys_LimitsList[] = + "sys/limits.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzNested_Sys_LimitsMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zNested_Sys_LimitsSelect0[] = + "CHILD_MAX"; + +#define NESTED_SYS_LIMITS_TEST_CT 1 +static tTestDesc aNested_Sys_LimitsTests[] = { + { TT_EGREP, zNested_Sys_LimitsSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Nested_Sys_Limits + */ +static const char* apzNested_Sys_LimitsPatch[] = { sed_cmd_z, + "-e", "/CHILD_MAX/s,/\\* Max, Max,", + "-e", "/OPEN_MAX/s,/\\* Max, Max,", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Netbsd_C99_Inline_1 fix */ -tSCC zNested_MotorolaName[] = - "nested_motorola"; +tSCC zNetbsd_C99_Inline_1Name[] = + "netbsd_c99_inline_1"; /* * File name selection pattern */ -tSCC zNested_MotorolaList[] = - "|sys/limits.h|limits.h|"; +tSCC zNetbsd_C99_Inline_1List[] = + "signal.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzNested_MotorolaMachs[] = { - "m68k-motorola-sysv*", +tSCC* apzNetbsd_C99_Inline_1Machs[] = { + "*-*-netbsd*", (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"; +tSCC zNetbsd_C99_Inline_1Select0[] = + "extern __inline int"; -#define NESTED_MOTOROLA_TEST_CT 1 -static tTestDesc aNested_MotorolaTests[] = { - { TT_EGREP, zNested_MotorolaSelect0, (regex_t*)NULL }, }; +#define NETBSD_C99_INLINE_1_TEST_CT 1 +static tTestDesc aNetbsd_C99_Inline_1Tests[] = { + { TT_EGREP, zNetbsd_C99_Inline_1Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Nested_Motorola + * Fix Command Arguments for Netbsd_C99_Inline_1 */ -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@", +static const char* apzNetbsd_C99_Inline_1Patch[] = { + "format", + "extern\n\ +#ifdef __GNUC_STDC_INLINE__\n\ +__attribute__((__gnu_inline__))\n\ +#endif\n\ +__inline int", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Nested_Sys_Limits fix + * Description of Netbsd_C99_Inline_2 fix */ -tSCC zNested_Sys_LimitsName[] = - "nested_sys_limits"; +tSCC zNetbsd_C99_Inline_2Name[] = + "netbsd_c99_inline_2"; /* * File name selection pattern */ -tSCC zNested_Sys_LimitsList[] = - "|sys/limits.h|"; +tSCC zNetbsd_C99_Inline_2List[] = + "signal.h\0"; /* * Machine/OS name selection pattern */ -#define apzNested_Sys_LimitsMachs (const char**)NULL +tSCC* apzNetbsd_C99_Inline_2Machs[] = { + "*-*-netbsd*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zNested_Sys_LimitsSelect0[] = - "CHILD_MAX"; +tSCC zNetbsd_C99_Inline_2Select0[] = + "#define _SIGINLINE extern __inline"; -#define NESTED_SYS_LIMITS_TEST_CT 1 -static tTestDesc aNested_Sys_LimitsTests[] = { - { TT_EGREP, zNested_Sys_LimitsSelect0, (regex_t*)NULL }, }; +#define NETBSD_C99_INLINE_2_TEST_CT 1 +static tTestDesc aNetbsd_C99_Inline_2Tests[] = { + { TT_EGREP, zNetbsd_C99_Inline_2Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Nested_Sys_Limits + * Fix Command Arguments for Netbsd_C99_Inline_2 */ -static const char* apzNested_Sys_LimitsPatch[] = { "sed", - "-e", "/CHILD_MAX/s,/\\* Max, Max,", - "-e", "/OPEN_MAX/s,/\\* Max, Max,", +static const char* apzNetbsd_C99_Inline_2Patch[] = { + "format", + "#ifdef __GNUC_STDC_INLINE__\n\ +#define _SIGINLINE extern __attribute__((__gnu_inline__)) __inline\n\ +#else\n\ +%0\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -4211,7 +4493,7 @@ tSCC zNetbsd_Extra_SemicolonName[] = * File name selection pattern */ tSCC zNetbsd_Extra_SemicolonList[] = - "|sys/cdefs.h|"; + "sys/cdefs.h\0"; /* * Machine/OS name selection pattern */ @@ -4248,7 +4530,7 @@ tSCC zNext_Math_PrefixName[] = * File name selection pattern */ tSCC zNext_Math_PrefixList[] = - "|ansi/math.h|"; + "ansi/math.h\0"; /* * Machine/OS name selection pattern */ @@ -4284,7 +4566,7 @@ tSCC zNext_TemplateName[] = * File name selection pattern */ tSCC zNext_TemplateList[] = - "|bsd/libc.h|"; + "bsd/libc.h\0"; /* * Machine/OS name selection pattern */ @@ -4320,7 +4602,7 @@ tSCC zNext_VolitileName[] = * File name selection pattern */ tSCC zNext_VolitileList[] = - "|ansi/stdlib.h|"; + "ansi/stdlib.h\0"; /* * Machine/OS name selection pattern */ @@ -4356,7 +4638,7 @@ tSCC zNext_Wait_UnionName[] = * File name selection pattern */ tSCC zNext_Wait_UnionList[] = - "|sys/wait.h|"; + "sys/wait.h\0"; /* * Machine/OS name selection pattern */ @@ -4391,7 +4673,7 @@ tSCC zNodeent_SyntaxName[] = * File name selection pattern */ tSCC zNodeent_SyntaxList[] = - "|netdnet/dnetdb.h|"; + "netdnet/dnetdb.h\0"; /* * Machine/OS name selection pattern */ @@ -4426,7 +4708,7 @@ tSCC zObstack_Lvalue_CastName[] = * File name selection pattern */ tSCC zObstack_Lvalue_CastList[] = - "|obstack.h|"; + "obstack.h\0"; /* * Machine/OS name selection pattern */ @@ -4461,7 +4743,7 @@ tSCC zOsf_Namespace_AName[] = * File name selection pattern */ tSCC zOsf_Namespace_AList[] = - "|reg_types.h|sys/lc_core.h|"; + "reg_types.h\0sys/lc_core.h\0"; /* * Machine/OS name selection pattern */ @@ -4506,7 +4788,7 @@ tSCC zOsf_Namespace_CName[] = * File name selection pattern */ tSCC zOsf_Namespace_CList[] = - "|regex.h|"; + "regex.h\0"; /* * Machine/OS name selection pattern */ @@ -4560,7 +4842,7 @@ tSCC zPthread_Page_SizeName[] = * File name selection pattern */ tSCC zPthread_Page_SizeList[] = - "|pthread.h|"; + "pthread.h\0"; /* * Machine/OS name selection pattern */ @@ -4595,7 +4877,7 @@ tSCC zPthread_Incomplete_Struct_ArgumentName[] = * File name selection pattern */ tSCC zPthread_Incomplete_Struct_ArgumentList[] = - "|pthread.h|"; + "pthread.h\0"; /* * Machine/OS name selection pattern */ @@ -4631,7 +4913,7 @@ tSCC zRead_Ret_TypeName[] = * File name selection pattern */ tSCC zRead_Ret_TypeList[] = - "|stdio.h|"; + "stdio.h\0"; /* * Machine/OS name selection pattern */ @@ -4668,7 +4950,7 @@ tSCC zRpc_Xdr_Lvalue_Cast_AName[] = * File name selection pattern */ tSCC zRpc_Xdr_Lvalue_Cast_AList[] = - "|rpc/xdr.h|"; + "rpc/xdr.h\0"; /* * Machine/OS name selection pattern */ @@ -4704,7 +4986,7 @@ tSCC zRpc_Xdr_Lvalue_Cast_BName[] = * File name selection pattern */ tSCC zRpc_Xdr_Lvalue_Cast_BList[] = - "|rpc/xdr.h|"; + "rpc/xdr.h\0"; /* * Machine/OS name selection pattern */ @@ -4740,7 +5022,7 @@ tSCC zRs6000_DoubleName[] = * File name selection pattern */ tSCC zRs6000_DoubleList[] = - "|math.h|"; + "math.h\0"; /* * Machine/OS name selection pattern */ @@ -4778,7 +5060,7 @@ tSCC zRs6000_FchmodName[] = * File name selection pattern */ tSCC zRs6000_FchmodList[] = - "|sys/stat.h|"; + "sys/stat.h\0"; /* * Machine/OS name selection pattern */ @@ -4813,7 +5095,7 @@ tSCC zRs6000_ParamName[] = * File name selection pattern */ tSCC zRs6000_ParamList[] = - "|stdio.h|unistd.h|"; + "stdio.h\0unistd.h\0"; /* * Machine/OS name selection pattern */ @@ -4848,7 +5130,7 @@ tSCC zSco_MathName[] = * 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|"; + "math.h\0*/math.h\0"; /* * Machine/OS name selection pattern */ @@ -4874,7 +5156,7 @@ static tTestDesc aSco_MathTests[] = { /* * Fix Command Arguments for Sco_Math */ -static const char* apzSco_MathPatch[] = { "sed", +static const char* apzSco_MathPatch[] = { sed_cmd_z, "-e", "/#define.*__fp_class(a) \\\\/i\\\n\ #ifndef __GNUC__\n", "-e", "/.*__builtin_generic/a\\\n\ @@ -4893,189 +5175,72 @@ static const char* apzSco_MathPatch[] = { "sed", /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sco_Regset fix + * Description of Solaris_Math_1 fix */ -tSCC zSco_RegsetName[] = - "sco_regset"; +tSCC zSolaris_Math_1Name[] = + "solaris_math_1"; /* * File name selection pattern */ -tSCC zSco_RegsetList[] = - "|sys/regset.h|"; +tSCC zSolaris_Math_1List[] = + "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzSco_RegsetMachs[] = { - "*-*-sco3.2v5*", - (const char*)NULL }; +#define apzSolaris_Math_1Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSco_RegsetSelect0[] = - "(struct[ \t]+.*)fpstate"; +tSCC zSolaris_Math_1Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSolaris_Math_1Bypass0[] = + "__GNUC__"; -#define SCO_REGSET_TEST_CT 1 -static tTestDesc aSco_RegsetTests[] = { - { TT_EGREP, zSco_RegsetSelect0, (regex_t*)NULL }, }; +#define SOLARIS_MATH_1_TEST_CT 2 +static tTestDesc aSolaris_Math_1Tests[] = { + { TT_NEGREP, zSolaris_Math_1Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_1Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Sco_Regset + * Fix Command Arguments for Solaris_Math_1 */ -static const char* apzSco_RegsetPatch[] = { +static const char* apzSolaris_Math_1Patch[] = { "format", - "%1rsfpstate", + "#define\tHUGE_VA%1\t(__builtin_huge_va%2())", + "^#define[ \t]+HUGE_VA([LF]+)[ \t]+__builtin_huge_va([lf]+)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sco_Static_Func fix + * Description of Solaris_Math_2 fix */ -tSCC zSco_Static_FuncName[] = - "sco_static_func"; +tSCC zSolaris_Math_2Name[] = + "solaris_math_2"; /* * File name selection pattern */ -tSCC zSco_Static_FuncList[] = - "|sys/stat.h|"; +tSCC zSolaris_Math_2List[] = + "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzSco_Static_FuncMachs[] = { - "i?86-*-sco3.2*", - (const char*)NULL }; +#define apzSolaris_Math_2Machs (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 }, }; +tSCC zSolaris_Math_2Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; /* - * 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|"; -/* - * 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[] = - "solaris_math_1"; - -/* - * File name selection pattern - */ -tSCC zSolaris_Math_1List[] = - "|iso/math_c99.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzSolaris_Math_1Machs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSolaris_Math_1Select0[] = - "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSolaris_Math_1Bypass0[] = - "__GNUC__"; - -#define SOLARIS_MATH_1_TEST_CT 2 -static tTestDesc aSolaris_Math_1Tests[] = { - { TT_NEGREP, zSolaris_Math_1Bypass0, (regex_t*)NULL }, - { TT_EGREP, zSolaris_Math_1Select0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Solaris_Math_1 - */ -static const char* apzSolaris_Math_1Patch[] = { - "format", - "#define\tHUGE_VA%1\t(__builtin_huge_va%2())", - "^#define[ \t]+HUGE_VA([LF]+)[ \t]+__builtin_huge_va([lf]+)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Solaris_Math_2 fix - */ -tSCC zSolaris_Math_2Name[] = - "solaris_math_2"; - -/* - * File name selection pattern - */ -tSCC zSolaris_Math_2List[] = - "|iso/math_c99.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzSolaris_Math_2Machs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSolaris_Math_2Select0[] = - "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; - -/* - * content bypass pattern - skip fix if pattern found + * content bypass pattern - skip fix if pattern found */ tSCC zSolaris_Math_2Bypass0[] = "__GNUC__"; @@ -5105,7 +5270,7 @@ tSCC zSolaris_Math_3Name[] = * File name selection pattern */ tSCC zSolaris_Math_3List[] = - "|iso/math_c99.h|"; + "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ @@ -5148,7 +5313,7 @@ tSCC zSolaris_Math_4Name[] = * File name selection pattern */ tSCC zSolaris_Math_4List[] = - "|iso/math_c99.h|"; + "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ @@ -5177,162 +5342,12 @@ static tTestDesc aSolaris_Math_4Tests[] = { static const char* apzSolaris_Math_4Patch[] = { "format", "#define\tfpclassify(x) \\\n\ - __extension__ ({ __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 }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Math_5 fix - */ -tSCC zSolaris_Math_5Name[] = - "solaris_math_5"; - -/* - * File name selection pattern - */ -tSCC zSolaris_Math_5List[] = - "|iso/math_c99.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzSolaris_Math_5Machs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSolaris_Math_5Select0[] = - "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSolaris_Math_5Bypass0[] = - "__GNUC__"; - -#define SOLARIS_MATH_5_TEST_CT 2 -static tTestDesc aSolaris_Math_5Tests[] = { - { TT_NEGREP, zSolaris_Math_5Bypass0, (regex_t*)NULL }, - { TT_EGREP, zSolaris_Math_5Select0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Solaris_Math_5 - */ -static const char* apzSolaris_Math_5Patch[] = { - "format", - "#define\tisfinite(x) \\\n\ - __extension__ ({ __typeof (x) __x_f = (x); \\\n\ -\t\t __builtin_expect(!isnan(__x_f - __x_f), 1); })", - "^#define[ \t]+isfinite\\(x\\)[ \t]+__builtin_isfinite\\(x\\)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Solaris_Math_6 fix - */ -tSCC zSolaris_Math_6Name[] = - "solaris_math_6"; - -/* - * File name selection pattern - */ -tSCC zSolaris_Math_6List[] = - "|iso/math_c99.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzSolaris_Math_6Machs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSolaris_Math_6Select0[] = - "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSolaris_Math_6Bypass0[] = - "__GNUC__"; - -#define SOLARIS_MATH_6_TEST_CT 2 -static tTestDesc aSolaris_Math_6Tests[] = { - { TT_NEGREP, zSolaris_Math_6Bypass0, (regex_t*)NULL }, - { TT_EGREP, zSolaris_Math_6Select0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Solaris_Math_6 - */ -static const char* apzSolaris_Math_6Patch[] = { - "format", - "#define\tisinf(x) \\\n\ - __extension__ ({ __typeof (x) __x_i = (x); \\\n\ -\t\t __builtin_expect(!isnan(__x_i) && !isfinite(__x_i), 0); })", - "^#define[ \t]+isinf\\(x\\)[ \t]+__builtin_isinf\\(x\\)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Solaris_Math_7 fix - */ -tSCC zSolaris_Math_7Name[] = - "solaris_math_7"; - -/* - * File name selection pattern - */ -tSCC zSolaris_Math_7List[] = - "|iso/math_c99.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzSolaris_Math_7Machs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSolaris_Math_7Select0[] = - "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSolaris_Math_7Bypass0[] = - "__GNUC__"; - -#define SOLARIS_MATH_7_TEST_CT 2 -static tTestDesc aSolaris_Math_7Tests[] = { - { TT_NEGREP, zSolaris_Math_7Bypass0, (regex_t*)NULL }, - { TT_EGREP, zSolaris_Math_7Select0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Solaris_Math_7 - */ -static const char* apzSolaris_Math_7Patch[] = { - "format", - "#define\tisnormal(x) \\\n\ - __extension__ ({ __typeof(x) __x_n = (x); \\\n\ -\t\t if (__x_n < 0.0) __x_n = -__x_n; \\\n\ -\t\t __builtin_expect(isfinite(__x_n) \\\n\ -\t\t\t\t && (sizeof(__x_n) == sizeof(float) \\\n\ -\t\t\t\t\t ? __x_n >= __FLT_MIN__ \\\n\ -\t\t\t\t\t : sizeof(__x_n) == sizeof(long double) \\\n\ -\t\t\t\t\t ? __x_n >= __LDBL_MIN__ \\\n\ -\t\t\t\t\t : __x_n >= __DBL_MIN__), 1); })", - "^#define[ \t]+isnormal\\(x\\)[ \t]+__builtin_isnormal\\(x\\)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Solaris_Math_8 fix */ tSCC zSolaris_Math_8Name[] = @@ -5342,7 +5357,7 @@ tSCC zSolaris_Math_8Name[] = * File name selection pattern */ tSCC zSolaris_Math_8List[] = - "|iso/math_c99.h|"; + "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ @@ -5389,7 +5404,7 @@ tSCC zSolaris_Math_9Name[] = * File name selection pattern */ tSCC zSolaris_Math_9List[] = - "|iso/math_c99.h|"; + "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ @@ -5423,37 +5438,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|"; +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 }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -5467,11 +5486,14 @@ tSCC zSolaris_Mutex_Init_2Name[] = * File name selection pattern */ tSCC zSolaris_Mutex_Init_2List[] = - "|pthread.h|"; + "pthread.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Mutex_Init_2Machs (const char**)NULL +tSCC* apzSolaris_Mutex_Init_2Machs[] = { + "*-*-solaris2.[0-9]", + "*-*-solaris2.[0-9][!0-9]*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found @@ -5491,9 +5513,10 @@ static const char* apzSolaris_Mutex_Init_2Patch[] = { "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\ %0\n\ #else\n\ -%1, {0}}%3\n\ +%1, {0}}%4\n\ #endif", - "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+\\{.*),[ \t]*0\\}(|[ \t].*)$", + "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+(|/*.**/[ \t]*\\\\\n\ +[ \t]*)\\{.*),[ \t]*0\\}(|[ \t].*)$", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -5507,7 +5530,7 @@ tSCC zSolaris_Rwlock_Init_1Name[] = * File name selection pattern */ tSCC zSolaris_Rwlock_Init_1List[] = - "|pthread.h|"; + "pthread.h\0"; /* * Machine/OS name selection pattern */ @@ -5549,7 +5572,7 @@ tSCC zSolaris_Once_Init_1Name[] = * File name selection pattern */ tSCC zSolaris_Once_Init_1List[] = - "|pthread.h|"; + "pthread.h\0"; /* * Machine/OS name selection pattern */ @@ -5578,38 +5601,45 @@ static const char* apzSolaris_Once_Init_1Patch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Socket fix + * Description of Solaris_Once_Init_2 fix */ -tSCC zSolaris_SocketName[] = - "solaris_socket"; +tSCC zSolaris_Once_Init_2Name[] = + "solaris_once_init_2"; /* * File name selection pattern */ -tSCC zSolaris_SocketList[] = - "|sys/socket.h|"; +tSCC zSolaris_Once_Init_2List[] = + "pthread.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_SocketMachs (const char**)NULL +tSCC* apzSolaris_Once_Init_2Machs[] = { + "*-*-solaris2.[0-9]", + "*-*-solaris2.[0-9][!0-9]*", + (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"; +tSCC zSolaris_Once_Init_2Select0[] = + "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; -#define SOLARIS_SOCKET_TEST_CT 1 -static tTestDesc aSolaris_SocketTests[] = { - { TT_EGREP, zSolaris_SocketSelect0, (regex_t*)NULL }, }; +#define SOLARIS_ONCE_INIT_2_TEST_CT 1 +static tTestDesc aSolaris_Once_Init_2Tests[] = { + { TT_EGREP, zSolaris_Once_Init_2Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Socket + * Fix Command Arguments for Solaris_Once_Init_2 */ -static const char* apzSolaris_SocketPatch[] = { +static const char* apzSolaris_Once_Init_2Patch[] = { "format", - "extern int %1(int, %2void *, int, int);", - "^extern int (recv|send)\\(int, (const )*char \\*, int, int\\);", + "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\ +%0\n\ +#else\n\ +%1{0}, {0}, {0}, {%3}%4\n\ +#endif", + "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{\\{)(0, 0, 0, )(PTHREAD_[A-Z_]+)(\\}\\})[ \t]*$", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -5623,7 +5653,7 @@ tSCC zSolaris_Stdio_TagName[] = * File name selection pattern */ tSCC zSolaris_Stdio_TagList[] = - "|stdio_tag.h|"; + "stdio_tag.h\0"; /* * Machine/OS name selection pattern */ @@ -5649,102 +5679,12 @@ static tTestDesc aSolaris_Stdio_TagTests[] = { /* * Fix Command Arguments for Solaris_Stdio_Tag */ -static const char* apzSolaris_Stdio_TagPatch[] = { "sed", +static const char* apzSolaris_Stdio_TagPatch[] = { sed_cmd_z, "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * 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[] = - "solaris_widec"; - -/* - * File name selection pattern - */ -tSCC zSolaris_WidecList[] = - "|widec.h|"; -/* - * 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[] = @@ -5754,7 +5694,7 @@ tSCC zStatsswtchName[] = * File name selection pattern */ tSCC zStatsswtchList[] = - "|rpcsvc/rstat.h|"; + "rpcsvc/rstat.h\0"; /* * Machine/OS name selection pattern */ @@ -5789,7 +5729,7 @@ tSCC zStdio_Stdarg_HName[] = * File name selection pattern */ tSCC zStdio_Stdarg_HList[] = - "|stdio.h|"; + "stdio.h\0"; /* * Machine/OS name selection pattern */ @@ -5827,7 +5767,7 @@ tSCC zStdio_Va_ListName[] = * File name selection pattern */ tSCC zStdio_Va_ListList[] = - "|stdio.h|internal/stdio_core.h|internal/wchar_core.h|"; + "stdio.h\0internal/stdio_core.h\0internal/wchar_core.h\0"; /* * Machine/OS name selection pattern */ @@ -5848,7 +5788,7 @@ static tTestDesc aStdio_Va_ListTests[] = { /* * Fix Command Arguments for Stdio_Va_List */ -static const char* apzStdio_Va_ListPatch[] = { "sed", +static const char* apzStdio_Va_ListPatch[] = { sed_cmd_z, "-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\ s@(va_list)&@(__gnuc_va_list)\\&@\n\ s@ _VA_LIST_));@ __gnuc_va_list));@\n\ @@ -5876,7 +5816,7 @@ tSCC zStdio_Va_List_ClientsName[] = * File name selection pattern */ tSCC zStdio_Va_List_ClientsList[] = - "|com_err.h|cps.h|curses.h|krb5.h|lc_core.h|pfmt.h|wchar.h|curses_colr/curses.h|"; + "com_err.h\0cps.h\0curses.h\0krb5.h\0lc_core.h\0pfmt.h\0wchar.h\0curses_colr/curses.h\0"; /* * Machine/OS name selection pattern */ @@ -5898,7 +5838,7 @@ static tTestDesc aStdio_Va_List_ClientsTests[] = { /* * Fix Command Arguments for Stdio_Va_List_Clients */ -static const char* apzStdio_Va_List_ClientsPatch[] = { "sed", +static const char* apzStdio_Va_List_ClientsPatch[] = { sed_cmd_z, "-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\ s@(va_list)&@(__gnuc_va_list)\\&@\n\ s@ _VA_LIST_));@ __gnuc_va_list));@\n\ @@ -5976,7 +5916,7 @@ tSCC zStrict_Ansi_Not_CtdName[] = * File name selection pattern */ tSCC zStrict_Ansi_Not_CtdList[] = - "|math.h|limits.h|stdio.h|signal.h|stdlib.h|sys/signal.h|time.h|"; + "math.h\0limits.h\0stdio.h\0signal.h\0stdlib.h\0sys/signal.h\0time.h\0"; /* * Machine/OS name selection pattern */ @@ -5994,1547 +5934,823 @@ tSCC zStrict_Ansi_Not_CtdSelect0[] = tSCC zStrict_Ansi_Not_CtdFTst0[] = "stdc_0_in_system_headers"; #define STRICT_ANSI_NOT_CTD_TEST_CT 2 -static tTestDesc aStrict_Ansi_Not_CtdTests[] = { - { TT_FUNCTION, zStrict_Ansi_Not_CtdFTst0, 0 /* unused */ }, - { TT_EGREP, zStrict_Ansi_Not_CtdSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Strict_Ansi_Not_Ctd - */ -static const char* apzStrict_Ansi_Not_CtdPatch[] = { - "format", - "%1 !defined(__STRICT_ANSI__)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Strict_Ansi_Only fix - */ -tSCC zStrict_Ansi_OnlyName[] = - "strict_ansi_only"; - -/* - * File name selection pattern - */ -#define zStrict_Ansi_OnlyList (char*)NULL -/* - * Machine/OS name selection pattern - */ -#define apzStrict_Ansi_OnlyMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zStrict_Ansi_OnlySelect0[] = - "^([ \t]*#[ \t]*if.*)(__STDC__[ \t]*!=[ \t]*0|__STDC__[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*!=[ \t]*0)"; - -/* - * perform the C function call test - */ -tSCC zStrict_Ansi_OnlyFTst0[] = "stdc_0_in_system_headers"; - -#define STRICT_ANSI_ONLY_TEST_CT 2 -static tTestDesc aStrict_Ansi_OnlyTests[] = { - { TT_FUNCTION, zStrict_Ansi_OnlyFTst0, 0 /* unused */ }, - { TT_EGREP, zStrict_Ansi_OnlySelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Strict_Ansi_Only - */ -static const char* apzStrict_Ansi_OnlyPatch[] = { - "format", - "%1 defined(__STRICT_ANSI__)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Struct_File fix - */ -tSCC zStruct_FileName[] = - "struct_file"; - -/* - * File name selection pattern - */ -tSCC zStruct_FileList[] = - "|rpc/xdr.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzStruct_FileMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zStruct_FileSelect0[] = - "^.*xdrstdio_create.*struct __file_s"; - -#define STRUCT_FILE_TEST_CT 1 -static tTestDesc aStruct_FileTests[] = { - { TT_EGREP, zStruct_FileSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Struct_File - */ -static const char* apzStruct_FilePatch[] = { - "format", - "struct __file_s;\n\ -%0", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Struct_Sockaddr fix - */ -tSCC zStruct_SockaddrName[] = - "struct_sockaddr"; - -/* - * File name selection pattern - */ -tSCC zStruct_SockaddrList[] = - "|rpc/auth.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzStruct_SockaddrMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zStruct_SockaddrSelect0[] = - "^.*authdes_create.*struct sockaddr[^_]"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zStruct_SockaddrBypass0[] = - ""; -tSCC zStruct_SockaddrBypass1[] = - "struct sockaddr;\n"; - -#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 }, }; - -/* - * Fix Command Arguments for Struct_Sockaddr - */ -static const char* apzStruct_SockaddrPatch[] = { - "format", - "struct sockaddr;\n\ -%0", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Sun_Auth_Proto fix - */ -tSCC zSun_Auth_ProtoName[] = - "sun_auth_proto"; - -/* - * File name selection pattern - */ -tSCC zSun_Auth_ProtoList[] = - "|rpc/auth.h|rpc/clnt.h|rpc/svc.h|rpc/xdr.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzSun_Auth_ProtoMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSun_Auth_ProtoSelect0[] = - "\\(\\*[a-z][a-z_]*\\)\\(\\)"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSun_Auth_ProtoBypass0[] = - "__cplusplus"; - -#define SUN_AUTH_PROTO_TEST_CT 2 -static tTestDesc aSun_Auth_ProtoTests[] = { - { TT_NEGREP, zSun_Auth_ProtoBypass0, (regex_t*)NULL }, - { TT_EGREP, zSun_Auth_ProtoSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Sun_Auth_Proto - */ -static const char* apzSun_Auth_ProtoPatch[] = { - "format", - "#ifdef __cplusplus\n\ -%1(...);%2\n\ -#else\n\ -%1();%2\n\ -#endif", - "(.*\\(\\*[a-z][a-z_]*\\))\\(\\);(.*)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Sun_Bogus_Ifdef fix - */ -tSCC zSun_Bogus_IfdefName[] = - "sun_bogus_ifdef"; - -/* - * File name selection pattern - */ -tSCC zSun_Bogus_IfdefList[] = - "|hsfs/hsfs_spec.h|hsfs/iso_spec.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzSun_Bogus_IfdefMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSun_Bogus_IfdefSelect0[] = - "#ifdef(.*\\|\\|.*)"; - -#define SUN_BOGUS_IFDEF_TEST_CT 1 -static tTestDesc aSun_Bogus_IfdefTests[] = { - { TT_EGREP, zSun_Bogus_IfdefSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Sun_Bogus_Ifdef - */ -static const char* apzSun_Bogus_IfdefPatch[] = { - "format", - "#if%1", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Sun_Catmacro fix - */ -tSCC zSun_CatmacroName[] = - "sun_catmacro"; - -/* - * File name selection pattern - */ -tSCC zSun_CatmacroList[] = - "|pixrect/memvar.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzSun_CatmacroMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSun_CatmacroSelect0[] = - "^#define[ \t]+CAT\\(a,b\\).*"; - -#define SUN_CATMACRO_TEST_CT 1 -static tTestDesc aSun_CatmacroTests[] = { - { TT_EGREP, zSun_CatmacroSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Sun_Catmacro - */ -static const char* apzSun_CatmacroPatch[] = { - "format", - "#ifdef __STDC__\n\ -# define CAT(a,b) a##b\n\ -#else\n\ -%0\n\ -#endif", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Sun_Malloc fix - */ -tSCC zSun_MallocName[] = - "sun_malloc"; - -/* - * File name selection pattern - */ -tSCC zSun_MallocList[] = - "|malloc.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzSun_MallocMachs (const char**)NULL - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSun_MallocBypass0[] = - "_CLASSIC_ANSI_TYPES"; - -#define SUN_MALLOC_TEST_CT 1 -static tTestDesc aSun_MallocTests[] = { - { TT_NEGREP, zSun_MallocBypass0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Sun_Malloc - */ -static const char* apzSun_MallocPatch[] = { "sed", - "-e", "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g", - "-e", "s/int[ \t][ \t]*free/void\tfree/g", - "-e", "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g", - "-e", "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g", - "-e", "s/char\\([ \t]*\\*[ \t]*calloc\\)/void\\1/g", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Sun_Rusers_Semi fix - */ -tSCC zSun_Rusers_SemiName[] = - "sun_rusers_semi"; - -/* - * File name selection pattern - */ -tSCC zSun_Rusers_SemiList[] = - "|rpcsvc/rusers.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzSun_Rusers_SemiMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSun_Rusers_SemiSelect0[] = - "_cnt$"; - -#define SUN_RUSERS_SEMI_TEST_CT 1 -static tTestDesc aSun_Rusers_SemiTests[] = { - { TT_EGREP, zSun_Rusers_SemiSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Sun_Rusers_Semi - */ -static const char* apzSun_Rusers_SemiPatch[] = { "sed", - "-e", "/^struct/,/^};/s/_cnt$/_cnt;/", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Sun_Signal fix - */ -tSCC zSun_SignalName[] = - "sun_signal"; - -/* - * File name selection pattern - */ -tSCC zSun_SignalList[] = - "|sys/signal.h|signal.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzSun_SignalMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSun_SignalSelect0[] = - "^void\t\\(\\*signal\\(\\)\\)\\(\\);.*"; - -#define SUN_SIGNAL_TEST_CT 1 -static tTestDesc aSun_SignalTests[] = { - { TT_EGREP, zSun_SignalSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Sun_Signal - */ -static const char* apzSun_SignalPatch[] = { - "format", - "#ifdef __cplusplus\n\ -void\t(*signal(...))(...);\n\ -#else\n\ -%0\n\ -#endif", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Sunos_Strlen fix - */ -tSCC zSunos_StrlenName[] = - "sunos_strlen"; - -/* - * File name selection pattern - */ -tSCC zSunos_StrlenList[] = - "|strings.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzSunos_StrlenMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSunos_StrlenSelect0[] = - "int[ \t]*strlen\\(\\);(.*)"; - -#define SUNOS_STRLEN_TEST_CT 1 -static tTestDesc aSunos_StrlenTests[] = { - { TT_EGREP, zSunos_StrlenSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Sunos_Strlen - */ -static const char* apzSunos_StrlenPatch[] = { - "format", - "__SIZE_TYPE__ strlen();%1", - (char*)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[] = - "svr4_getcwd"; - -/* - * File name selection pattern - */ -tSCC zSvr4_GetcwdList[] = - "|stdlib.h|unistd.h|prototypes.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzSvr4_GetcwdMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSvr4_GetcwdSelect0[] = - "getcwd\\(char \\*, int\\)"; - -#define SVR4_GETCWD_TEST_CT 1 -static tTestDesc aSvr4_GetcwdTests[] = { - { TT_EGREP, zSvr4_GetcwdSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Svr4_Getcwd - */ -static const char* apzSvr4_GetcwdPatch[] = { - "format", - "getcwd(char *, size_t)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * 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[] = - "svr4_profil"; - -/* - * File name selection pattern - */ -tSCC zSvr4_ProfilList[] = - "|stdlib.h|unistd.h|"; -/* - * 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|"; -/* - * 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[] = - "sysv68_string"; - -/* - * File name selection pattern - */ -tSCC zSysv68_StringList[] = - "|testing.h|string.h|"; -/* - * 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|"; -/* - * 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|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 }, }; +static tTestDesc aStrict_Ansi_Not_CtdTests[] = { + { TT_FUNCTION, zStrict_Ansi_Not_CtdFTst0, 0 /* unused */ }, + { TT_EGREP, zStrict_Ansi_Not_CtdSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Thread_Keyword + * Fix Command Arguments for Strict_Ansi_Not_Ctd */ -static const char* apzThread_KeywordPatch[] = { +static const char* apzStrict_Ansi_Not_CtdPatch[] = { "format", - "%1__thr%2", + "%1 !defined(__STRICT_ANSI__)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Tinfo_Cplusplus fix + * Description of Strict_Ansi_Only fix */ -tSCC zTinfo_CplusplusName[] = - "tinfo_cplusplus"; +tSCC zStrict_Ansi_OnlyName[] = + "strict_ansi_only"; /* * File name selection pattern */ -tSCC zTinfo_CplusplusList[] = - "|tinfo.h|"; +#define zStrict_Ansi_OnlyList (char*)NULL /* * Machine/OS name selection pattern */ -#define apzTinfo_CplusplusMachs (const char**)NULL +#define apzStrict_Ansi_OnlyMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zTinfo_CplusplusSelect0[] = - "[ \t]_cplusplus"; +tSCC zStrict_Ansi_OnlySelect0[] = + "^([ \t]*#[ \t]*if.*)(__STDC__[ \t]*!=[ \t]*0|__STDC__[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*!=[ \t]*0)"; -#define TINFO_CPLUSPLUS_TEST_CT 1 -static tTestDesc aTinfo_CplusplusTests[] = { - { TT_EGREP, zTinfo_CplusplusSelect0, (regex_t*)NULL }, }; +/* + * perform the C function call test + */ +tSCC zStrict_Ansi_OnlyFTst0[] = "stdc_0_in_system_headers"; + +#define STRICT_ANSI_ONLY_TEST_CT 2 +static tTestDesc aStrict_Ansi_OnlyTests[] = { + { TT_FUNCTION, zStrict_Ansi_OnlyFTst0, 0 /* unused */ }, + { TT_EGREP, zStrict_Ansi_OnlySelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Tinfo_Cplusplus + * Fix Command Arguments for Strict_Ansi_Only */ -static const char* apzTinfo_CplusplusPatch[] = { +static const char* apzStrict_Ansi_OnlyPatch[] = { "format", - " __cplusplus", + "%1 defined(__STRICT_ANSI__)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Atexit_Param fix + * Description of Struct_File fix */ -tSCC zUltrix_Atexit_ParamName[] = - "ultrix_atexit_param"; +tSCC zStruct_FileName[] = + "struct_file"; /* * File name selection pattern */ -tSCC zUltrix_Atexit_ParamList[] = - "|stdlib.h|"; +tSCC zStruct_FileList[] = + "rpc/xdr.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_Atexit_ParamMachs (const char**)NULL +#define apzStruct_FileMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_Atexit_ParamSelect0[] = - "atexit\\(.*\\(\\)"; +tSCC zStruct_FileSelect0[] = + "^.*xdrstdio_create.*struct __file_s"; -#define ULTRIX_ATEXIT_PARAM_TEST_CT 1 -static tTestDesc aUltrix_Atexit_ParamTests[] = { - { TT_EGREP, zUltrix_Atexit_ParamSelect0, (regex_t*)NULL }, }; +#define STRUCT_FILE_TEST_CT 1 +static tTestDesc aStruct_FileTests[] = { + { TT_EGREP, zStruct_FileSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Atexit_Param + * Fix Command Arguments for Struct_File */ -static const char* apzUltrix_Atexit_ParamPatch[] = { +static const char* apzStruct_FilePatch[] = { "format", - "atexit( void (*__func)( void )", + "struct __file_s;\n\ +%0", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Atof_Param fix + * Description of Struct_Sockaddr fix */ -tSCC zUltrix_Atof_ParamName[] = - "ultrix_atof_param"; +tSCC zStruct_SockaddrName[] = + "struct_sockaddr"; /* * File name selection pattern */ -tSCC zUltrix_Atof_ParamList[] = - "|math.h|"; +tSCC zStruct_SockaddrList[] = + "rpc/auth.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_Atof_ParamMachs (const char**)NULL +#define apzStruct_SockaddrMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_Atof_ParamSelect0[] = - "atof\\([ \t]*char"; +tSCC zStruct_SockaddrSelect0[] = + "^.*authdes_create.*struct sockaddr[^_]"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zStruct_SockaddrBypass0[] = + ""; +tSCC zStruct_SockaddrBypass1[] = + "struct sockaddr;\n"; -#define ULTRIX_ATOF_PARAM_TEST_CT 1 -static tTestDesc aUltrix_Atof_ParamTests[] = { - { TT_EGREP, zUltrix_Atof_ParamSelect0, (regex_t*)NULL }, }; +#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 }, }; /* - * Fix Command Arguments for Ultrix_Atof_Param + * Fix Command Arguments for Struct_Sockaddr */ -static const char* apzUltrix_Atof_ParamPatch[] = { +static const char* apzStruct_SockaddrPatch[] = { "format", - "atof(const char", + "struct sockaddr;\n\ +%0", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Const fix + * Description of Sun_Auth_Proto fix */ -tSCC zUltrix_ConstName[] = - "ultrix_const"; +tSCC zSun_Auth_ProtoName[] = + "sun_auth_proto"; /* * File name selection pattern */ -tSCC zUltrix_ConstList[] = - "|stdio.h|"; +tSCC zSun_Auth_ProtoList[] = + "rpc/auth.h\0rpc/clnt.h\0rpc/svc.h\0rpc/xdr.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_ConstMachs (const char**)NULL +#define apzSun_Auth_ProtoMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_ConstSelect0[] = - "perror\\( char \\*"; +tSCC zSun_Auth_ProtoSelect0[] = + "\\(\\*[a-z][a-z_]*\\)\\(\\)"; -#define ULTRIX_CONST_TEST_CT 1 -static tTestDesc aUltrix_ConstTests[] = { - { TT_EGREP, zUltrix_ConstSelect0, (regex_t*)NULL }, }; +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSun_Auth_ProtoBypass0[] = + "__cplusplus"; + +#define SUN_AUTH_PROTO_TEST_CT 2 +static tTestDesc aSun_Auth_ProtoTests[] = { + { TT_NEGREP, zSun_Auth_ProtoBypass0, (regex_t*)NULL }, + { TT_EGREP, zSun_Auth_ProtoSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Const + * Fix Command Arguments for Sun_Auth_Proto */ -static const char* apzUltrix_ConstPatch[] = { +static const char* apzSun_Auth_ProtoPatch[] = { "format", - "%1 const %3 *__", - "([ \t*](perror|fputs|fwrite|scanf|fscanf)\\(.*)[ \t]+(char|void) \\*__", + "#ifdef __cplusplus\n\ +%1(...);%2\n\ +#else\n\ +%1();%2\n\ +#endif", + "(.*\\(\\*[a-z][a-z_]*\\))\\(\\);(.*)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Const2 fix + * Description of Sun_Bogus_Ifdef fix */ -tSCC zUltrix_Const2Name[] = - "ultrix_const2"; +tSCC zSun_Bogus_IfdefName[] = + "sun_bogus_ifdef"; /* * File name selection pattern */ -tSCC zUltrix_Const2List[] = - "|stdio.h|"; +tSCC zSun_Bogus_IfdefList[] = + "hsfs/hsfs_spec.h\0hsfs/iso_spec.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_Const2Machs (const char**)NULL +#define apzSun_Bogus_IfdefMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_Const2Select0[] = - "\\*fopen\\( char \\*"; +tSCC zSun_Bogus_IfdefSelect0[] = + "#ifdef(.*\\|\\|.*)"; -#define ULTRIX_CONST2_TEST_CT 1 -static tTestDesc aUltrix_Const2Tests[] = { - { TT_EGREP, zUltrix_Const2Select0, (regex_t*)NULL }, }; +#define SUN_BOGUS_IFDEF_TEST_CT 1 +static tTestDesc aSun_Bogus_IfdefTests[] = { + { TT_EGREP, zSun_Bogus_IfdefSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Const2 + * Fix Command Arguments for Sun_Bogus_Ifdef */ -static const char* apzUltrix_Const2Patch[] = { +static const char* apzSun_Bogus_IfdefPatch[] = { "format", - "%1( const char *%3, const char *", - "([ \t*](fopen|sscanf|popen|tempnam))\\([ \t]*char[ \t]*\\*([^,]*),[ \t]*char[ \t]*\\*[ \t]*", + "#if%1", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Const3 fix + * Description of Sun_Catmacro fix */ -tSCC zUltrix_Const3Name[] = - "ultrix_const3"; +tSCC zSun_CatmacroName[] = + "sun_catmacro"; /* * File name selection pattern */ -tSCC zUltrix_Const3List[] = - "|stdio.h|"; +tSCC zSun_CatmacroList[] = + "pixrect/memvar.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_Const3Machs (const char**)NULL +#define apzSun_CatmacroMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_Const3Select0[] = - "fdopen\\( .*, char \\*"; +tSCC zSun_CatmacroSelect0[] = + "^#define[ \t]+CAT\\(a,b\\).*"; -#define ULTRIX_CONST3_TEST_CT 1 -static tTestDesc aUltrix_Const3Tests[] = { - { TT_EGREP, zUltrix_Const3Select0, (regex_t*)NULL }, }; +#define SUN_CATMACRO_TEST_CT 1 +static tTestDesc aSun_CatmacroTests[] = { + { TT_EGREP, zSun_CatmacroSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Const3 + * Fix Command Arguments for Sun_Catmacro */ -static const char* apzUltrix_Const3Patch[] = { +static const char* apzSun_CatmacroPatch[] = { "format", - "%1 const %3 *__", - "([ \t*](fdopen)\\(.*)[ \t]+(char|void) \\*__", + "#ifdef __STDC__\n\ +# define CAT(a,b) a##b\n\ +#else\n\ +%0\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Fix_Fixproto fix + * Description of Sun_Malloc fix */ -tSCC zUltrix_Fix_FixprotoName[] = - "ultrix_fix_fixproto"; +tSCC zSun_MallocName[] = + "sun_malloc"; /* * File name selection pattern */ -tSCC zUltrix_Fix_FixprotoList[] = - "|sys/utsname.h|"; +tSCC zSun_MallocList[] = + "malloc.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_Fix_FixprotoMachs (const char**)NULL +#define apzSun_MallocMachs (const char**)NULL /* - * content selection pattern - do fix if pattern found + * content bypass pattern - skip fix if pattern found */ -tSCC zUltrix_Fix_FixprotoSelect0[] = - "ULTRIX"; +tSCC zSun_MallocBypass0[] = + "_CLASSIC_ANSI_TYPES"; -#define ULTRIX_FIX_FIXPROTO_TEST_CT 1 -static tTestDesc aUltrix_Fix_FixprotoTests[] = { - { TT_EGREP, zUltrix_Fix_FixprotoSelect0, (regex_t*)NULL }, }; +#define SUN_MALLOC_TEST_CT 1 +static tTestDesc aSun_MallocTests[] = { + { TT_NEGREP, zSun_MallocBypass0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Fix_Fixproto + * Fix Command Arguments for Sun_Malloc */ -static const char* apzUltrix_Fix_FixprotoPatch[] = { - "format", - "struct utsname;\n\ -%0", - "^[ \t]*extern[ \t]*int[ \t]*uname\\(\\);", +static const char* apzSun_MallocPatch[] = { sed_cmd_z, + "-e", "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g", + "-e", "s/int[ \t][ \t]*free/void\tfree/g", + "-e", "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g", + "-e", "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g", + "-e", "s/char\\([ \t]*\\*[ \t]*calloc\\)/void\\1/g", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Ifdef fix + * Description of Sun_Rusers_Semi fix */ -tSCC zUltrix_IfdefName[] = - "ultrix_ifdef"; +tSCC zSun_Rusers_SemiName[] = + "sun_rusers_semi"; /* * File name selection pattern */ -tSCC zUltrix_IfdefList[] = - "|sys/file.h|"; +tSCC zSun_Rusers_SemiList[] = + "rpcsvc/rusers.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_IfdefMachs (const char**)NULL +#define apzSun_Rusers_SemiMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_IfdefSelect0[] = - "^#ifdef KERNEL[ \t]+&&"; +tSCC zSun_Rusers_SemiSelect0[] = + "_cnt$"; -#define ULTRIX_IFDEF_TEST_CT 1 -static tTestDesc aUltrix_IfdefTests[] = { - { TT_EGREP, zUltrix_IfdefSelect0, (regex_t*)NULL }, }; +#define SUN_RUSERS_SEMI_TEST_CT 1 +static tTestDesc aSun_Rusers_SemiTests[] = { + { TT_EGREP, zSun_Rusers_SemiSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Ifdef + * Fix Command Arguments for Sun_Rusers_Semi */ -static const char* apzUltrix_IfdefPatch[] = { - "format", - "#if defined(KERNEL) &&", +static const char* apzSun_Rusers_SemiPatch[] = { sed_cmd_z, + "-e", "/^struct/,/^};/s/_cnt$/_cnt;/", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Locale fix + * Description of Sun_Signal fix */ -tSCC zUltrix_LocaleName[] = - "ultrix_locale"; +tSCC zSun_SignalName[] = + "sun_signal"; /* * File name selection pattern */ -tSCC zUltrix_LocaleList[] = - "|locale.h|"; +tSCC zSun_SignalList[] = + "sys/signal.h\0signal.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_LocaleMachs (const char**)NULL +#define apzSun_SignalMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_LocaleSelect0[] = - "@\\(#\\)locale\\.h.*6\\.1.*\\(ULTRIX\\)"; +tSCC zSun_SignalSelect0[] = + "^void\t\\(\\*signal\\(\\)\\)\\(\\);.*"; -#define ULTRIX_LOCALE_TEST_CT 1 -static tTestDesc aUltrix_LocaleTests[] = { - { TT_EGREP, zUltrix_LocaleSelect0, (regex_t*)NULL }, }; +#define SUN_SIGNAL_TEST_CT 1 +static tTestDesc aSun_SignalTests[] = { + { TT_EGREP, zSun_SignalSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Locale + * Fix Command Arguments for Sun_Signal */ -static const char* apzUltrix_LocalePatch[] = { - "wrap", +static const char* apzSun_SignalPatch[] = { + "format", + "#ifdef __cplusplus\n\ +void\t(*signal(...))(...);\n\ +#else\n\ +%0\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Math_Ifdef fix + * Description of Sunos_Strlen fix */ -tSCC zUltrix_Math_IfdefName[] = - "ultrix_math_ifdef"; +tSCC zSunos_StrlenName[] = + "sunos_strlen"; /* * File name selection pattern */ -tSCC zUltrix_Math_IfdefList[] = - "|sys/limits.h|float.h|math.h|"; +tSCC zSunos_StrlenList[] = + "strings.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_Math_IfdefMachs (const char**)NULL +#define apzSunos_StrlenMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_Math_IfdefSelect0[] = - "^(#if.*)\\|\\|[ \t]+CC\\$[a-z]+"; +tSCC zSunos_StrlenSelect0[] = + "int[ \t]*strlen\\(\\);(.*)"; -#define ULTRIX_MATH_IFDEF_TEST_CT 1 -static tTestDesc aUltrix_Math_IfdefTests[] = { - { TT_EGREP, zUltrix_Math_IfdefSelect0, (regex_t*)NULL }, }; +#define SUNOS_STRLEN_TEST_CT 1 +static tTestDesc aSunos_StrlenTests[] = { + { TT_EGREP, zSunos_StrlenSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Math_Ifdef + * Fix Command Arguments for Sunos_Strlen */ -static const char* apzUltrix_Math_IfdefPatch[] = { +static const char* apzSunos_StrlenPatch[] = { "format", - "%1", + "__SIZE_TYPE__ strlen();%1", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Nested_Ioctl fix + * Description of Svr4_Disable_Opt fix */ -tSCC zUltrix_Nested_IoctlName[] = - "ultrix_nested_ioctl"; +tSCC zSvr4_Disable_OptName[] = + "svr4_disable_opt"; /* * File name selection pattern */ -tSCC zUltrix_Nested_IoctlList[] = - "|sys/ioctl.h|"; +tSCC zSvr4_Disable_OptList[] = + "string.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_Nested_IoctlMachs (const char**)NULL +#define apzSvr4_Disable_OptMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_Nested_IoctlSelect0[] = - "^/\\* #define SIOCSCREEN"; +tSCC zSvr4_Disable_OptSelect0[] = + "#define.*__std_hdr_"; -#define ULTRIX_NESTED_IOCTL_TEST_CT 1 -static tTestDesc aUltrix_Nested_IoctlTests[] = { - { TT_EGREP, zUltrix_Nested_IoctlSelect0, (regex_t*)NULL }, }; +#define SVR4_DISABLE_OPT_TEST_CT 1 +static tTestDesc aSvr4_Disable_OptTests[] = { + { TT_EGREP, zSvr4_Disable_OptSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Nested_Ioctl + * Fix Command Arguments for Svr4_Disable_Opt */ -static const char* apzUltrix_Nested_IoctlPatch[] = { "sed", - "-e", "/^\\/\\* #define SIOCSCREEN/s@/\\* screend@*//* screend@", +static const char* apzSvr4_Disable_OptPatch[] = { sed_cmd_z, + "-e", "/#define.*__std_hdr_/d", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Nested_Svc fix + * Description of Svr4_Getcwd fix */ -tSCC zUltrix_Nested_SvcName[] = - "ultrix_nested_svc"; +tSCC zSvr4_GetcwdName[] = + "svr4_getcwd"; /* * File name selection pattern */ -tSCC zUltrix_Nested_SvcList[] = - "|rpc/svc.h|"; +tSCC zSvr4_GetcwdList[] = + "stdlib.h\0unistd.h\0prototypes.h\0"; /* * Machine/OS name selection pattern */ -#define apzUltrix_Nested_SvcMachs (const char**)NULL +#define apzSvr4_GetcwdMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zUltrix_Nested_SvcSelect0[] = - "^ \\*[ \t]*int protocol; */\\*"; +tSCC zSvr4_GetcwdSelect0[] = + "getcwd\\(char \\*, int\\)"; -#define ULTRIX_NESTED_SVC_TEST_CT 1 -static tTestDesc aUltrix_Nested_SvcTests[] = { - { TT_EGREP, zUltrix_Nested_SvcSelect0, (regex_t*)NULL }, }; +#define SVR4_GETCWD_TEST_CT 1 +static tTestDesc aSvr4_GetcwdTests[] = { + { TT_EGREP, zSvr4_GetcwdSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ultrix_Nested_Svc + * Fix Command Arguments for Svr4_Getcwd */ -static const char* apzUltrix_Nested_SvcPatch[] = { "sed", - "-e", "s@^\\( \\*\tint protocol; \\)/\\*@\\1*/ /*@", +static const char* apzSvr4_GetcwdPatch[] = { + "format", + "getcwd(char *, size_t)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ultrix_Stat fix + * Description of Svr4_Profil fix */ -tSCC zUltrix_StatName[] = - "ultrix_stat"; +tSCC zSvr4_ProfilName[] = + "svr4_profil"; /* * File name selection pattern */ -tSCC zUltrix_StatList[] = - "|sys/stat.h|"; +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|"; +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|"; +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|"; +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_cmd_z, + "-e", "s/extern[ \t]*int[ \t]*strlen();/extern unsigned int strlen();/", + "-e", "s/extern[ \t]*int[ \t]*ffs[ \t]*(long);/extern int ffs(int);/", + "-e", "s/strdup(char \\*s1);/strdup(const char *s1);/", + "-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|"; +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|"; +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|"; +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|stdlib.h|wchar.h|"; +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|"; +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 }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -7548,7 +6764,7 @@ tSCC zVa_I960_MacroName[] = * File name selection pattern */ tSCC zVa_I960_MacroList[] = - "|arch/i960/archI960.h|"; + "arch/i960/archI960.h\0"; /* * Machine/OS name selection pattern */ @@ -7583,7 +6799,7 @@ tSCC zVoid_NullName[] = * File name selection pattern */ tSCC zVoid_NullList[] = - "|curses.h|dbm.h|locale.h|stdio.h|stdlib.h|string.h|time.h|unistd.h|sys/dir.h|sys/param.h|sys/types.h|"; + "curses.h\0dbm.h\0locale.h\0stdio.h\0stdlib.h\0string.h\0time.h\0unistd.h\0sys/dir.h\0sys/param.h\0sys/types.h\0"; /* * Machine/OS name selection pattern */ @@ -7625,7 +6841,7 @@ tSCC zVxworks_Gcc_ProblemName[] = * File name selection pattern */ tSCC zVxworks_Gcc_ProblemList[] = - "|types/vxTypesBase.h|"; + "types/vxTypesBase.h\0"; /* * Machine/OS name selection pattern */ @@ -7644,7 +6860,7 @@ static tTestDesc aVxworks_Gcc_ProblemTests[] = { /* * Fix Command Arguments for Vxworks_Gcc_Problem */ -static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed", +static const char* apzVxworks_Gcc_ProblemPatch[] = { sed_cmd_z, "-e", "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/", "-e", "/[ \t]size_t/i\\\n\ #ifndef _GCC_SIZE_T\\\n\ @@ -7674,7 +6890,7 @@ tSCC zVxworks_Needs_VxtypesName[] = * File name selection pattern */ tSCC zVxworks_Needs_VxtypesList[] = - "|time.h|"; + "time.h\0"; /* * Machine/OS name selection pattern */ @@ -7709,7 +6925,7 @@ tSCC zVxworks_Needs_VxworksName[] = * File name selection pattern */ tSCC zVxworks_Needs_VxworksList[] = - "|sys/stat.h|"; + "sys/stat.h\0"; /* * Machine/OS name selection pattern */ @@ -7741,7 +6957,7 @@ static tTestDesc aVxworks_Needs_VxworksTests[] = { /* * Fix Command Arguments for Vxworks_Needs_Vxworks */ -static const char* apzVxworks_Needs_VxworksPatch[] = { "sed", +static const char* apzVxworks_Needs_VxworksPatch[] = { sed_cmd_z, "-e", "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n\ #include \n", (char*)NULL }; @@ -7757,7 +6973,7 @@ tSCC zVxworks_TimeName[] = * File name selection pattern */ tSCC zVxworks_TimeList[] = - "|time.h|"; + "time.h\0"; /* * Machine/OS name selection pattern */ @@ -7798,97 +7014,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|"; -/* - * 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[] = @@ -7898,7 +7023,7 @@ tSCC zX11_ClassName[] = * File name selection pattern */ tSCC zX11_ClassList[] = - "|X11/ShellP.h|"; + "X11/ShellP.h\0"; /* * Machine/OS name selection pattern */ @@ -7944,7 +7069,7 @@ tSCC zX11_Class_UsageName[] = * File name selection pattern */ tSCC zX11_Class_UsageList[] = - "|Xm/BaseClassI.h|"; + "Xm/BaseClassI.h\0"; /* * Machine/OS name selection pattern */ @@ -7986,7 +7111,7 @@ tSCC zX11_NewName[] = * File name selection pattern */ tSCC zX11_NewList[] = - "|Xm/Traversal.h|"; + "Xm/Traversal.h\0"; /* * Machine/OS name selection pattern */ @@ -8005,7 +7130,7 @@ static tTestDesc aX11_NewTests[] = { /* * Fix Command Arguments for X11_New */ -static const char* apzX11_NewPatch[] = { "sed", +static const char* apzX11_NewPatch[] = { sed_cmd_z, "-e", "/Widget\told, new;/i\\\n\ #ifdef __cplusplus\\\n\ \tWidget\told, c_new;\\\n\ @@ -8026,7 +7151,7 @@ tSCC zX11_SprintfName[] = * File name selection pattern */ tSCC zX11_SprintfList[] = - "|X11/Xmu.h|X11/Xmu/Xmu.h|"; + "X11/Xmu.h\0X11/Xmu/Xmu.h\0"; /* * Machine/OS name selection pattern */ @@ -8057,14 +7182,15 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 241 -#define MACH_LIST_SIZE_LIMIT 261 -#define FIX_COUNT 198 +#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, @@ -8072,10 +7198,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, @@ -8107,6 +7229,7 @@ typedef enum { CTRL_QUOTES_DEF_FIXIDX, CTRL_QUOTES_USE_FIXIDX, CXX_UNREADY_FIXIDX, + DARWIN_EXTERNC_FIXIDX, DARWIN_GCC4_BREAKAGE_FIXIDX, DARWIN_PRIVATE_EXTERN_FIXIDX, DEC_INTERN_ASM_FIXIDX, @@ -8115,9 +7238,16 @@ typedef enum { EXCEPTION_STRUCTURE_FIXIDX, FREEBSD_GCC3_BREAKAGE_FIXIDX, FREEBSD_GCC4_BREAKAGE_FIXIDX, + GLIBC_C99_INLINE_1_FIXIDX, + GLIBC_C99_INLINE_1A_FIXIDX, + GLIBC_C99_INLINE_2_FIXIDX, + GLIBC_C99_INLINE_3_FIXIDX, + GLIBC_C99_INLINE_4_FIXIDX, + GLIBC_MUTEX_INIT_FIXIDX, GNU_TYPES_FIXIDX, HP_INLINE_FIXIDX, HP_SYSFILE_FIXIDX, + HPPA_HPUX_FP_MACROS_FIXIDX, HPUX10_CPP_POW_INLINE_FIXIDX, HPUX11_CPP_POW_INLINE_FIXIDX, HPUX10_CTYPE_DECLARATIONS1_FIXIDX, @@ -8125,6 +7255,7 @@ typedef enum { HPUX10_STDIO_DECLARATIONS_FIXIDX, HPUX11_ABS_FIXIDX, HPUX11_FABSF_FIXIDX, + HPUX11_PTHREAD_CONST_FIXIDX, HPUX11_SIZE_T_FIXIDX, HPUX11_SNPRINTF_FIXIDX, HPUX11_UINT32_C_FIXIDX, @@ -8135,7 +7266,10 @@ typedef enum { HPUX_LONG_DOUBLE_FIXIDX, HPUX_SYSTIME_FIXIDX, HPUX_SPU_INFO_FIXIDX, + HPUX11_EXTERN_SENDFILE_FIXIDX, + HPUX11_EXTERN_SENDPATH_FIXIDX, HPUX_EXTERN_ERRNO_FIXIDX, + HPUX_PTHREAD_INITIALIZERS_FIXIDX, HUGE_VAL_HEX_FIXIDX, HUGE_VALF_HEX_FIXIDX, HUGE_VALL_HEX_FIXIDX, @@ -8149,13 +7283,12 @@ typedef enum { IRIX_ASM_APOSTROPHE_FIXIDX, IRIX_LIMITS_CONST_FIXIDX, IRIX_SOCKLEN_T_FIXIDX, + IRIX_STDINT_C99_FIXIDX, IRIX_STDIO_VA_LIST_FIXIDX, IRIX_WCSFTIME_FIXIDX, 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, @@ -8164,8 +7297,9 @@ 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, NETBSD_EXTRA_SEMICOLON_FIXIDX, NEXT_MATH_PREFIX_FIXIDX, NEXT_TEMPLATE_FIXIDX, @@ -8184,26 +7318,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_5_FIXIDX, - SOLARIS_MATH_6_FIXIDX, - SOLARIS_MATH_7_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_SOCKET_FIXIDX, + SOLARIS_ONCE_INIT_2_FIXIDX, SOLARIS_STDIO_TAG_FIXIDX, - SOLARIS_UNISTD_FIXIDX, - SOLARIS_WIDEC_FIXIDX, STATSSWTCH_FIXIDX, STDIO_STDARG_H_FIXIDX, STDIO_VA_LIST_FIXIDX, @@ -8222,7 +7348,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, @@ -8230,35 +7355,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, @@ -8266,6 +7370,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, @@ -8301,26 +7410,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, @@ -8448,7 +7537,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = { { zBroken_CabsName, zBroken_CabsList, apzBroken_CabsMachs, - BROKEN_CABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + BROKEN_CABS_TEST_CT, FD_MACH_ONLY, aBroken_CabsTests, apzBroken_CabsPatch, 0 }, { zBroken_NanName, zBroken_NanList, @@ -8476,6 +7565,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aCxx_UnreadyTests, apzCxx_UnreadyPatch, 0 }, + { zDarwin_ExterncName, zDarwin_ExterncList, + apzDarwin_ExterncMachs, + DARWIN_EXTERNC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_ExterncTests, apzDarwin_ExterncPatch, 0 }, + { zDarwin_Gcc4_BreakageName, zDarwin_Gcc4_BreakageList, apzDarwin_Gcc4_BreakageMachs, DARWIN_GCC4_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8516,6 +7610,36 @@ tFixDesc fixDescList[ FIX_COUNT ] = { FREEBSD_GCC4_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aFreebsd_Gcc4_BreakageTests, apzFreebsd_Gcc4_BreakagePatch, 0 }, + { zGlibc_C99_Inline_1Name, zGlibc_C99_Inline_1List, + apzGlibc_C99_Inline_1Machs, + GLIBC_C99_INLINE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aGlibc_C99_Inline_1Tests, apzGlibc_C99_Inline_1Patch, 0 }, + + { zGlibc_C99_Inline_1aName, zGlibc_C99_Inline_1aList, + apzGlibc_C99_Inline_1aMachs, + GLIBC_C99_INLINE_1A_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aGlibc_C99_Inline_1aTests, apzGlibc_C99_Inline_1aPatch, 0 }, + + { zGlibc_C99_Inline_2Name, zGlibc_C99_Inline_2List, + apzGlibc_C99_Inline_2Machs, + GLIBC_C99_INLINE_2_TEST_CT, FD_MACH_ONLY, + aGlibc_C99_Inline_2Tests, apzGlibc_C99_Inline_2Patch, 0 }, + + { zGlibc_C99_Inline_3Name, zGlibc_C99_Inline_3List, + apzGlibc_C99_Inline_3Machs, + GLIBC_C99_INLINE_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aGlibc_C99_Inline_3Tests, apzGlibc_C99_Inline_3Patch, 0 }, + + { zGlibc_C99_Inline_4Name, zGlibc_C99_Inline_4List, + apzGlibc_C99_Inline_4Machs, + GLIBC_C99_INLINE_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aGlibc_C99_Inline_4Tests, apzGlibc_C99_Inline_4Patch, 0 }, + + { zGlibc_Mutex_InitName, zGlibc_Mutex_InitList, + apzGlibc_Mutex_InitMachs, + GLIBC_MUTEX_INIT_TEST_CT, FD_MACH_ONLY, + aGlibc_Mutex_InitTests, apzGlibc_Mutex_InitPatch, 0 }, + { zGnu_TypesName, zGnu_TypesList, apzGnu_TypesMachs, GNU_TYPES_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE, @@ -8531,6 +7655,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HP_SYSFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHp_SysfileTests, apzHp_SysfilePatch, 0 }, + { zHppa_Hpux_Fp_MacrosName, zHppa_Hpux_Fp_MacrosList, + apzHppa_Hpux_Fp_MacrosMachs, + HPPA_HPUX_FP_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHppa_Hpux_Fp_MacrosTests, apzHppa_Hpux_Fp_MacrosPatch, 0 }, + { zHpux10_Cpp_Pow_InlineName, zHpux10_Cpp_Pow_InlineList, apzHpux10_Cpp_Pow_InlineMachs, HPUX10_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8566,6 +7695,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux11_FabsfTests, apzHpux11_FabsfPatch, 0 }, + { zHpux11_Pthread_ConstName, zHpux11_Pthread_ConstList, + apzHpux11_Pthread_ConstMachs, + HPUX11_PTHREAD_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux11_Pthread_ConstTests, apzHpux11_Pthread_ConstPatch, 0 }, + { zHpux11_Size_TName, zHpux11_Size_TList, apzHpux11_Size_TMachs, HPUX11_SIZE_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8616,11 +7750,26 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX_SPU_INFO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux_Spu_InfoTests, apzHpux_Spu_InfoPatch, 0 }, + { zHpux11_Extern_SendfileName, zHpux11_Extern_SendfileList, + apzHpux11_Extern_SendfileMachs, + HPUX11_EXTERN_SENDFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux11_Extern_SendfileTests, apzHpux11_Extern_SendfilePatch, 0 }, + + { zHpux11_Extern_SendpathName, zHpux11_Extern_SendpathList, + apzHpux11_Extern_SendpathMachs, + HPUX11_EXTERN_SENDPATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux11_Extern_SendpathTests, apzHpux11_Extern_SendpathPatch, 0 }, + { zHpux_Extern_ErrnoName, zHpux_Extern_ErrnoList, apzHpux_Extern_ErrnoMachs, HPUX_EXTERN_ERRNO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux_Extern_ErrnoTests, apzHpux_Extern_ErrnoPatch, 0 }, + { zHpux_Pthread_InitializersName, zHpux_Pthread_InitializersList, + apzHpux_Pthread_InitializersMachs, + HPUX_PTHREAD_INITIALIZERS_TEST_CT, FD_MACH_ONLY, + aHpux_Pthread_InitializersTests, apzHpux_Pthread_InitializersPatch, 0 }, + { zHuge_Val_HexName, zHuge_Val_HexList, apzHuge_Val_HexMachs, HUGE_VAL_HEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8686,6 +7835,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { IRIX_SOCKLEN_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aIrix_Socklen_TTests, apzIrix_Socklen_TPatch, 0 }, + { zIrix_Stdint_C99Name, zIrix_Stdint_C99List, + apzIrix_Stdint_C99Machs, + IRIX_STDINT_C99_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aIrix_Stdint_C99Tests, apzIrix_Stdint_C99Patch, 0 }, + { zIrix_Stdio_Va_ListName, zIrix_Stdio_Va_ListList, apzIrix_Stdio_Va_ListMachs, IRIX_STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8711,16 +7865,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, @@ -8761,16 +7905,21 @@ 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, aNested_Sys_LimitsTests, apzNested_Sys_LimitsPatch, 0 }, + { zNetbsd_C99_Inline_1Name, zNetbsd_C99_Inline_1List, + apzNetbsd_C99_Inline_1Machs, + NETBSD_C99_INLINE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aNetbsd_C99_Inline_1Tests, apzNetbsd_C99_Inline_1Patch, 0 }, + + { zNetbsd_C99_Inline_2Name, zNetbsd_C99_Inline_2List, + apzNetbsd_C99_Inline_2Machs, + NETBSD_C99_INLINE_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aNetbsd_C99_Inline_2Tests, apzNetbsd_C99_Inline_2Patch, 0 }, + { zNetbsd_Extra_SemicolonName, zNetbsd_Extra_SemicolonList, apzNetbsd_Extra_SemicolonMachs, NETBSD_EXTRA_SEMICOLON_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8861,21 +8010,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, @@ -8896,21 +8030,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SOLARIS_MATH_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSolaris_Math_4Tests, apzSolaris_Math_4Patch, 0 }, - { zSolaris_Math_5Name, zSolaris_Math_5List, - apzSolaris_Math_5Machs, - SOLARIS_MATH_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aSolaris_Math_5Tests, apzSolaris_Math_5Patch, 0 }, - - { zSolaris_Math_6Name, zSolaris_Math_6List, - apzSolaris_Math_6Machs, - SOLARIS_MATH_6_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aSolaris_Math_6Tests, apzSolaris_Math_6Patch, 0 }, - - { zSolaris_Math_7Name, zSolaris_Math_7List, - apzSolaris_Math_7Machs, - SOLARIS_MATH_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aSolaris_Math_7Tests, apzSolaris_Math_7Patch, 0 }, - { zSolaris_Math_8Name, zSolaris_Math_8List, apzSolaris_Math_8Machs, SOLARIS_MATH_8_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8921,10 +8040,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, @@ -8941,26 +8060,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SOLARIS_ONCE_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSolaris_Once_Init_1Tests, apzSolaris_Once_Init_1Patch, 0 }, - { zSolaris_SocketName, zSolaris_SocketList, - apzSolaris_SocketMachs, - SOLARIS_SOCKET_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aSolaris_SocketTests, apzSolaris_SocketPatch, 0 }, + { zSolaris_Once_Init_2Name, zSolaris_Once_Init_2List, + apzSolaris_Once_Init_2Machs, + SOLARIS_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Once_Init_2Tests, apzSolaris_Once_Init_2Patch, 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, @@ -9051,11 +8160,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, @@ -9091,16 +8195,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, @@ -9111,86 +8205,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, @@ -9221,21 +8235,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,