X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=fixincludes%2Ffixincl.x;h=dd493bb625456fba69be1c8f4d335c296e00b11a;hb=bf31bf36ad84f85daca155f0b77e9d19d92f03f1;hp=3c1716f79ced4037c9a41a64e7eb41f6338c2363;hpb=3dd59d448bbc001708835cfa17479d96b7852bbe;p=pf3gnuchains%2Fgcc-fork.git diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 3c1716f79ce..dd493bb6254 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 Saturday October 7, 2006 at 12:32:06 PM EDT + * It has been AutoGen-ed Tuesday September 7, 2010 at 10:44:48 AM EDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Sat Oct 7 12:32:07 EDT 2006 +/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Sep 7 10:44:48 EDT 2010 * * 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 201 fixup descriptions. + * This file contains 208 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,388 +480,329 @@ 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", +#endif /* __memory_h__ */", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Complex fix + */ +tSCC zAix_ComplexName[] = + "aix_complex"; + +/* + * File name selection pattern + */ +tSCC zAix_ComplexList[] = + "complex.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_ComplexMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_ComplexSelect0[] = + "#define[ \t]_Complex_I[ \t]__I"; + +#define AIX_COMPLEX_TEST_CT 1 +static tTestDesc aAix_ComplexTests[] = { + { TT_EGREP, zAix_ComplexSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Complex + */ +static const char* apzAix_ComplexPatch[] = { + "format", + "#define _Complex_I (__extension__ 1.0iF)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Aab_Ultrix_Ansi_Compat fix + * Description of Aix_Pthread fix */ -tSCC zAab_Ultrix_Ansi_CompatName[] = - "AAB_ultrix_ansi_compat"; +tSCC zAix_PthreadName[] = + "aix_pthread"; /* * File name selection pattern */ -tSCC zAab_Ultrix_Ansi_CompatList[] = - "|ansi_compat.h|"; +tSCC zAix_PthreadList[] = + "pthread.h\0"; /* * Machine/OS name selection pattern */ -#define apzAab_Ultrix_Ansi_CompatMachs (const char**)NULL +#define apzAix_PthreadMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zAab_Ultrix_Ansi_CompatSelect0[] = - "ULTRIX"; +tSCC zAix_PthreadSelect0[] = + "(#define [A-Za-z_0-9]+)(\\\\\n\ +[^A-Za-z_0-9 \t\n\ +(])"; -#define AAB_ULTRIX_ANSI_COMPAT_TEST_CT 1 -static tTestDesc aAab_Ultrix_Ansi_CompatTests[] = { - { TT_EGREP, zAab_Ultrix_Ansi_CompatSelect0, (regex_t*)NULL }, }; +#define AIX_PTHREAD_TEST_CT 1 +static tTestDesc aAix_PthreadTests[] = { + { TT_EGREP, zAix_PthreadSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Aab_Ultrix_Ansi_Compat + * Fix Command Arguments for Aix_Pthread */ -static const char* apzAab_Ultrix_Ansi_CompatPatch[] = { -"/* This file intentionally left blank. */\n", +static const char* apzAix_PthreadPatch[] = { + "format", + "%1 %2", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Aab_Ultrix_Limits fix + * Description of Aix_Stdint_1 fix */ -tSCC zAab_Ultrix_LimitsName[] = - "AAB_ultrix_limits"; +tSCC zAix_Stdint_1Name[] = + "aix_stdint_1"; /* * File name selection pattern */ -tSCC zAab_Ultrix_LimitsList[] = - "|limits.h|"; +tSCC zAix_Stdint_1List[] = + "stdint-aix.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzAab_Ultrix_LimitsMachs[] = { - "*-*-ultrix4.3", +tSCC* apzAix_Stdint_1Machs[] = { + "*-*-aix*", (const char*)NULL }; -#define AAB_ULTRIX_LIMITS_TEST_CT 0 -#define aAab_Ultrix_LimitsTests (tTestDesc*)NULL /* - * Fix Command Arguments for Aab_Ultrix_Limits + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdint_1Select0[] = + "#define[ \t]UINT8_MAX[ \t]\\(255U\\)\n\ +#define[ \t]UINT16_MAX[ \t]\\(65535U\\)"; + +#define AIX_STDINT_1_TEST_CT 1 +static tTestDesc aAix_Stdint_1Tests[] = { + { TT_EGREP, zAix_Stdint_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdint_1 */ -static const char* apzAab_Ultrix_LimitsPatch[] = { -"#ifndef _LIMITS_INCLUDED\n\ - #define _LIMITS_INCLUDED\n\ - #include \n\ -#endif /* _LIMITS_INCLUDED */", +static const char* apzAix_Stdint_1Patch[] = { + "format", + "#define UINT8_MAX\t(255)\n\ +#define UINT16_MAX\t(65535)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Aab_Ultrix_Memory fix + * Description of Aix_Stdint_2 fix */ -tSCC zAab_Ultrix_MemoryName[] = - "AAB_ultrix_memory"; +tSCC zAix_Stdint_2Name[] = + "aix_stdint_2"; /* * File name selection pattern */ -tSCC zAab_Ultrix_MemoryList[] = - "|memory.h|"; +tSCC zAix_Stdint_2List[] = + "stdint-aix.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzAab_Ultrix_MemoryMachs[] = { - "*-*-ultrix4.3", +tSCC* apzAix_Stdint_2Machs[] = { + "*-*-aix*", (const char*)NULL }; -#define AAB_ULTRIX_MEMORY_TEST_CT 0 -#define aAab_Ultrix_MemoryTests (tTestDesc*)NULL /* - * Fix Command Arguments for Aab_Ultrix_Memory + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdint_2Select0[] = + "#define[ \t]INTPTR_MIN[ \t]INT64_MIN\n\ +#define[ \t]INTPTR_MAX[ \t]INT64_MAX\n\ +#define[ \t]UINTPTR_MAX[ \t]UINT64_MAX\n\ +#else\n\ +#define[ \t]INTPTR_MIN[ \t]INT32_MIN\n\ +#define[ \t]INTPTR_MAX[ \t]INT32_MAX\n\ +#define[ \t]UINTPTR_MAX[ \t]UINT32_MAX"; + +#define AIX_STDINT_2_TEST_CT 1 +static tTestDesc aAix_Stdint_2Tests[] = { + { TT_EGREP, zAix_Stdint_2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdint_2 */ -static const char* apzAab_Ultrix_MemoryPatch[] = { -"#ifndef _MEMORY_INCLUDED\n\ - #define _MEMORY_INCLUDED\n\ - #include \n\ -#endif /* _MEMORY_INCLUDED */", +static const char* apzAix_Stdint_2Patch[] = { + "format", + "#define INTPTR_MIN\t(-INTPTR_MAX-1)\n\ +#define INTPTR_MAX\t9223372036854775807L\n\ +#define UINTPTR_MAX\t18446744073709551615UL\n\ +#else\n\ +#define INTPTR_MIN\t(-INTPTR_MAX-1)\n\ +#define INTPTR_MAX\t2147483647L\n\ +#define UINTPTR_MAX\t4294967295UL", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Aab_Ultrix_String fix + * Description of Aix_Stdint_3 fix */ -tSCC zAab_Ultrix_StringName[] = - "AAB_ultrix_string"; +tSCC zAix_Stdint_3Name[] = + "aix_stdint_3"; /* * File name selection pattern */ -tSCC zAab_Ultrix_StringList[] = - "|string.h|"; +tSCC zAix_Stdint_3List[] = + "stdint-aix.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzAab_Ultrix_StringMachs[] = { - "*-*-ultrix4.3", +tSCC* apzAix_Stdint_3Machs[] = { + "*-*-aix*", (const char*)NULL }; -#define AAB_ULTRIX_STRING_TEST_CT 0 -#define aAab_Ultrix_StringTests (tTestDesc*)NULL /* - * Fix Command Arguments for Aab_Ultrix_String + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdint_3Select0[] = + "#define[ \t]PTRDIFF_MIN[ \t]INT64_MIN\n\ +#define[ \t]PTRDIFF_MAX[ \t]INT64_MAX\n\ +#else\n\ +#define[ \t]PTRDIFF_MIN[ \t]*INT32_MIN\n\ +#define[ \t]PTRDIFF_MAX[ \t]*INT32_MAX"; + +#define AIX_STDINT_3_TEST_CT 1 +static tTestDesc aAix_Stdint_3Tests[] = { + { TT_EGREP, zAix_Stdint_3Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdint_3 */ -static const char* apzAab_Ultrix_StringPatch[] = { -"#ifndef _STRING_INCLUDED\n\ - #define _STRING_INCLUDED\n\ - #include \n\ -#endif /* _STRING_INCLUDED */", +static const char* apzAix_Stdint_3Patch[] = { + "format", + "#define PTRDIFF_MIN\t(-9223372036854775807L - 1)\n\ +#define PTRDIFF_MAX\t9223372036854775807L\n\ +#else\n\ +#define PTRDIFF_MIN\t(-2147483647L - 1)\n\ +#define PTRDIFF_MAX\t2147483647L", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Aix_Pthread fix + * Description of Aix_Stdint_4 fix */ -tSCC zAix_PthreadName[] = - "aix_pthread"; +tSCC zAix_Stdint_4Name[] = + "aix_stdint_4"; /* * File name selection pattern */ -tSCC zAix_PthreadList[] = - "|pthread.h|"; +tSCC zAix_Stdint_4List[] = + "stdint-aix.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -#define apzAix_PthreadMachs (const char**)NULL +tSCC* apzAix_Stdint_4Machs[] = { + "*-*-aix*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zAix_PthreadSelect0[] = - "(#define [A-Za-z_0-9]+)(\\\\\n\ -[^A-Za-z_0-9 \t\n\ -(])"; +tSCC zAix_Stdint_4Select0[] = + "#define[ \t]SIZE_MAX[ \t]UINT64_MAX\n\ +#else\n\ +#define[ \t]SIZE_MAX[ \t]*UINT32_MAX"; -#define AIX_PTHREAD_TEST_CT 1 -static tTestDesc aAix_PthreadTests[] = { - { TT_EGREP, zAix_PthreadSelect0, (regex_t*)NULL }, }; +#define AIX_STDINT_4_TEST_CT 1 +static tTestDesc aAix_Stdint_4Tests[] = { + { TT_EGREP, zAix_Stdint_4Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Aix_Pthread + * Fix Command Arguments for Aix_Stdint_4 */ -static const char* apzAix_PthreadPatch[] = { +static const char* apzAix_Stdint_4Patch[] = { "format", - "%1 %2", + "#define SIZE_MAX\t18446744073709551615UL\n\ +#else\n\ +#define SIZE_MAX\t4294967295UL", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Aix_Sysmachine fix + * Description of Aix_Stdint_5 fix */ -tSCC zAix_SysmachineName[] = - "aix_sysmachine"; +tSCC zAix_Stdint_5Name[] = + "aix_stdint_5"; /* * File name selection pattern */ -tSCC zAix_SysmachineList[] = - "|sys/machine.h|"; +tSCC zAix_Stdint_5List[] = + "stdint-aix.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -#define apzAix_SysmachineMachs (const char**)NULL +tSCC* apzAix_Stdint_5Machs[] = { + "*-*-aix*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zAix_SysmachineSelect0[] = - "\\\\ +\n"; +tSCC zAix_Stdint_5Select0[] = + "#define[ \t]UINT8_C\\(c\\)[ \t]__CONCAT__\\(c,U\\)\n\ +#define[ \t]UINT16_C\\(c\\)[ \t]__CONCAT__\\(c,U\\)"; -#define AIX_SYSMACHINE_TEST_CT 1 -static tTestDesc aAix_SysmachineTests[] = { - { TT_EGREP, zAix_SysmachineSelect0, (regex_t*)NULL }, }; +#define AIX_STDINT_5_TEST_CT 1 +static tTestDesc aAix_Stdint_5Tests[] = { + { TT_EGREP, zAix_Stdint_5Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Aix_Sysmachine + * Fix Command Arguments for Aix_Stdint_5 */ -static const char* apzAix_SysmachinePatch[] = { +static const char* apzAix_Stdint_5Patch[] = { "format", - "\\\n", + "#define UINT8_C(c)\tc\n\ +#define UINT16_C(c)\tc", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Aix_Syswait fix + * Description of Aix_Sysmachine fix */ -tSCC zAix_SyswaitName[] = - "aix_syswait"; +tSCC zAix_SysmachineName[] = + "aix_sysmachine"; /* * File name selection pattern */ -tSCC zAix_SyswaitList[] = - "|sys/wait.h|"; +tSCC zAix_SysmachineList[] = + "sys/machine.h\0"; /* * Machine/OS name selection pattern */ -#define apzAix_SyswaitMachs (const char**)NULL +#define apzAix_SysmachineMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zAix_SyswaitSelect0[] = - "^extern pid_t wait3\\(\\);\n"; -tSCC zAix_SyswaitSelect1[] = - "bos325,"; +tSCC zAix_SysmachineSelect0[] = + "\\\\ +\n"; -#define AIX_SYSWAIT_TEST_CT 2 -static tTestDesc aAix_SyswaitTests[] = { - { TT_EGREP, zAix_SyswaitSelect0, (regex_t*)NULL }, - { TT_EGREP, zAix_SyswaitSelect1, (regex_t*)NULL }, }; +#define AIX_SYSMACHINE_TEST_CT 1 +static tTestDesc aAix_SysmachineTests[] = { + { TT_EGREP, zAix_SysmachineSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Aix_Syswait + * Fix Command Arguments for Aix_Sysmachine */ -static const char* apzAix_SyswaitPatch[] = { +static const char* apzAix_SysmachinePatch[] = { "format", - "struct rusage;\n\ -%0", + "\\\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -810,7 +816,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 +851,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 +886,7 @@ tSCC zAlpha___AssertName[] = * File name selection pattern */ tSCC zAlpha___AssertList[] = - "|assert.h|"; + "assert.h\0"; /* * Machine/OS name selection pattern */ @@ -953,7 +959,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 +996,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 +1033,7 @@ tSCC zAlpha_AssertName[] = * File name selection pattern */ tSCC zAlpha_AssertList[] = - "|assert.h|"; + "assert.h\0"; /* * Machine/OS name selection pattern */ @@ -1037,7 +1043,7 @@ tSCC zAlpha_AssertList[] = * content selection pattern - do fix if pattern found */ tSCC zAlpha_AssertSelect0[] = - "(#define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)"; + "(#[ \t]*define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)"; #define ALPHA_ASSERT_TEST_CT 1 static tTestDesc aAlpha_AssertTests[] = { @@ -1082,7 +1088,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 +1103,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 */ @@ -1123,6 +1129,41 @@ static const char* apzAlpha_GetoptPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Alpha_If_Semicolon fix + */ +tSCC zAlpha_If_SemicolonName[] = + "alpha_if_semicolon"; + +/* + * File name selection pattern + */ +tSCC zAlpha_If_SemicolonList[] = + "net/if.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzAlpha_If_SemicolonMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAlpha_If_SemicolonSelect0[] = + "struct[ \t]+sockaddr[ \t]+vmif_paddr[ \t]+/\\*"; + +#define ALPHA_IF_SEMICOLON_TEST_CT 1 +static tTestDesc aAlpha_If_SemicolonTests[] = { + { TT_EGREP, zAlpha_If_SemicolonSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Alpha_If_Semicolon + */ +static const char* apzAlpha_If_SemicolonPatch[] = { + "format", + "struct sockaddr vmif_paddr;\t/*", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Alpha_Parens fix */ tSCC zAlpha_ParensName[] = @@ -1132,7 +1173,7 @@ tSCC zAlpha_ParensName[] = * File name selection pattern */ tSCC zAlpha_ParensList[] = - "|sym.h|"; + "sym.h\0"; /* * Machine/OS name selection pattern */ @@ -1167,7 +1208,7 @@ tSCC zAlpha_PthreadName[] = * File name selection pattern */ tSCC zAlpha_PthreadList[] = - "|pthread.h|"; + "pthread.h\0"; /* * Machine/OS name selection pattern */ @@ -1206,7 +1247,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 +1287,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 +1308,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 +1328,7 @@ tSCC zAlpha_SbrkName[] = * File name selection pattern */ tSCC zAlpha_SbrkList[] = - "|unistd.h|"; + "unistd.h\0"; /* * Machine/OS name selection pattern */ @@ -1313,43 +1354,6 @@ static const char* apzAlpha_SbrkPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Alpha_Wchar fix - */ -tSCC zAlpha_WcharName[] = - "alpha_wchar"; - -/* - * File name selection pattern - */ -tSCC zAlpha_WcharList[] = - "|wchar.h|"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzAlpha_WcharMachs[] = { - "alpha*-dec-osf4*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAlpha_WcharSelect0[] = - "#define wcstok wcstok_r"; - -#define ALPHA_WCHAR_TEST_CT 1 -static tTestDesc aAlpha_WcharTests[] = { - { TT_EGREP, zAlpha_WcharSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Alpha_Wchar - */ -static const char* apzAlpha_WcharPatch[] = { "sed", - "-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 }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Avoid_Bool_Define fix */ tSCC zAvoid_Bool_DefineName[] = @@ -1359,7 +1363,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 +1408,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 +1501,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 +1536,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 +1571,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 +1613,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 +1657,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 +1676,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 +1692,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 +1734,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 +1842,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 +1880,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 +1934,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 +1971,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 */ @@ -1952,5715 +2000,6045 @@ static const char* apzDarwin_Private_ExternPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Dec_Intern_Asm fix + * Description of Darwin_Stdint_1 fix */ -tSCC zDec_Intern_AsmName[] = - "dec_intern_asm"; +tSCC zDarwin_Stdint_1Name[] = + "darwin_stdint_1"; /* * File name selection pattern */ -tSCC zDec_Intern_AsmList[] = - "|c_asm.h|"; +tSCC zDarwin_Stdint_1List[] = + "stdint-darwin.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -#define apzDec_Intern_AsmMachs (const char**)NULL -#define DEC_INTERN_ASM_TEST_CT 0 -#define aDec_Intern_AsmTests (tTestDesc*)NULL +tSCC* apzDarwin_Stdint_1Machs[] = { + "*-*-darwin*", + (const char*)NULL }; /* - * Fix Command Arguments for Dec_Intern_Asm + * content selection pattern - do fix if pattern found */ -static const char* apzDec_Intern_AsmPatch[] = { "sed", - "-e", "/^[ \t]*float[ \t]*fasm/i\\\n\ -#ifdef __DECC\n", - "-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n\ -#endif\n", +tSCC zDarwin_Stdint_1Select0[] = + "#define UINT8_C\\(v\\)[ \t]+\\(v ## U\\)\n\ +#define UINT16_C\\(v\\)[ \t]+\\(v ## U\\)"; + +#define DARWIN_STDINT_1_TEST_CT 1 +static tTestDesc aDarwin_Stdint_1Tests[] = { + { TT_EGREP, zDarwin_Stdint_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Stdint_1 + */ +static const char* apzDarwin_Stdint_1Patch[] = { + "format", + "#define UINT8_C(v)\tv\n\ +#define UINT16_C(v)\tv", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Djgpp_Wchar_H fix + * Description of Darwin_Stdint_2 fix */ -tSCC zDjgpp_Wchar_HName[] = - "djgpp_wchar_h"; +tSCC zDarwin_Stdint_2Name[] = + "darwin_stdint_2"; /* * File name selection pattern */ -#define zDjgpp_Wchar_HList (char*)NULL +tSCC zDarwin_Stdint_2List[] = + "stdint-darwin.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -#define apzDjgpp_Wchar_HMachs (const char**)NULL +tSCC* apzDarwin_Stdint_2Machs[] = { + "*-*-darwin*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zDjgpp_Wchar_HSelect0[] = - "__DJ_wint_t"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zDjgpp_Wchar_HBypass0[] = - "sys/djtypes.h"; +tSCC zDarwin_Stdint_2Select0[] = + "#if __WORDSIZE == 64\n\ +#define INTPTR_MIN[ \t]+INT64_MIN\n\ +#define INTPTR_MAX[ \t]+INT64_MAX\n\ +#else\n\ +#define INTPTR_MIN[ \t]+INT32_MIN\n\ +#define INTPTR_MAX[ \t]+INT32_MAX\n\ +#endif"; -#define DJGPP_WCHAR_H_TEST_CT 2 -static tTestDesc aDjgpp_Wchar_HTests[] = { - { TT_NEGREP, zDjgpp_Wchar_HBypass0, (regex_t*)NULL }, - { TT_EGREP, zDjgpp_Wchar_HSelect0, (regex_t*)NULL }, }; +#define DARWIN_STDINT_2_TEST_CT 1 +static tTestDesc aDarwin_Stdint_2Tests[] = { + { TT_EGREP, zDarwin_Stdint_2Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Djgpp_Wchar_H + * Fix Command Arguments for Darwin_Stdint_2 */ -static const char* apzDjgpp_Wchar_HPatch[] = { +static const char* apzDarwin_Stdint_2Patch[] = { "format", - "%0\n\ -#include ", - "#include ", + "#if __WORDSIZE == 64\n\ +#define INTPTR_MAX 9223372036854775807L\n\ +#define INTPTR_MIN (-INTPTR_MAX-1)\n\ +#else\n\ +#define INTPTR_MAX 2147483647L\n\ +#define INTPTR_MIN (-INTPTR_MAX-1)\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ecd_Cursor fix + * Description of Darwin_Stdint_3 fix */ -tSCC zEcd_CursorName[] = - "ecd_cursor"; +tSCC zDarwin_Stdint_3Name[] = + "darwin_stdint_3"; /* * File name selection pattern */ -tSCC zEcd_CursorList[] = - "|sunwindow/win_lock.h|sunwindow/win_cursor.h|"; +tSCC zDarwin_Stdint_3List[] = + "stdint-darwin.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -#define apzEcd_CursorMachs (const char**)NULL +tSCC* apzDarwin_Stdint_3Machs[] = { + "*-*-darwin*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zEcd_CursorSelect0[] = - "ecd\\.cursor"; +tSCC zDarwin_Stdint_3Select0[] = + "#if __WORDSIZE == 64\n\ +#define UINTPTR_MAX[ \t]+UINT64_MAX\n\ +#else\n\ +#define UINTPTR_MAX[ \t]+UINT32_MAX\n\ +#endif"; -#define ECD_CURSOR_TEST_CT 1 -static tTestDesc aEcd_CursorTests[] = { - { TT_EGREP, zEcd_CursorSelect0, (regex_t*)NULL }, }; +#define DARWIN_STDINT_3_TEST_CT 1 +static tTestDesc aDarwin_Stdint_3Tests[] = { + { TT_EGREP, zDarwin_Stdint_3Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ecd_Cursor + * Fix Command Arguments for Darwin_Stdint_3 */ -static const char* apzEcd_CursorPatch[] = { +static const char* apzDarwin_Stdint_3Patch[] = { "format", - "ecd_cursor", + "#if __WORDSIZE == 64\n\ +#define UINTPTR_MAX 18446744073709551615UL\n\ +#else\n\ +#define UINTPTR_MAX 4294967295UL\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Exception_Structure fix + * Description of Darwin_Stdint_4 fix */ -tSCC zException_StructureName[] = - "exception_structure"; +tSCC zDarwin_Stdint_4Name[] = + "darwin_stdint_4"; /* * File name selection pattern */ -tSCC zException_StructureList[] = - "|math.h|"; +tSCC zDarwin_Stdint_4List[] = + "stdint-darwin.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -#define apzException_StructureMachs (const char**)NULL +tSCC* apzDarwin_Stdint_4Machs[] = { + "*-*-darwin*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zException_StructureSelect0[] = - "matherr"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zException_StructureBypass0[] = - "matherr.*(struct exception|__MATH_EXCEPTION|[ \\t]*__FP_EXCEPTION[ \\t]*\\*[ \\t]*)"; +tSCC zDarwin_Stdint_4Select0[] = + "#if __WORDSIZE == 64\n\ +#define SIZE_MAX[ \t]+UINT64_MAX\n\ +#else\n\ +#define SIZE_MAX[ \t]+UINT32_MAX\n\ +#endif"; -#define EXCEPTION_STRUCTURE_TEST_CT 2 -static tTestDesc aException_StructureTests[] = { - { TT_NEGREP, zException_StructureBypass0, (regex_t*)NULL }, - { TT_EGREP, zException_StructureSelect0, (regex_t*)NULL }, }; +#define DARWIN_STDINT_4_TEST_CT 1 +static tTestDesc aDarwin_Stdint_4Tests[] = { + { TT_EGREP, zDarwin_Stdint_4Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Exception_Structure + * Fix Command Arguments for Darwin_Stdint_4 */ -static const char* apzException_StructurePatch[] = { - "wrap", - "struct exception;\n", +static const char* apzDarwin_Stdint_4Patch[] = { + "format", + "#if __WORDSIZE == 64\n\ +#define SIZE_MAX 18446744073709551615UL\n\ +#else\n\ +#define SIZE_MAX 4294967295UL\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Freebsd_Gcc3_Breakage fix + * Description of Darwin_Stdint_5 fix */ -tSCC zFreebsd_Gcc3_BreakageName[] = - "freebsd_gcc3_breakage"; +tSCC zDarwin_Stdint_5Name[] = + "darwin_stdint_5"; /* * File name selection pattern */ -tSCC zFreebsd_Gcc3_BreakageList[] = - "|sys/cdefs.h|"; +tSCC zDarwin_Stdint_5List[] = + "stdint-darwin.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzFreebsd_Gcc3_BreakageMachs[] = { - "*-*-freebsd*", +tSCC* apzDarwin_Stdint_5Machs[] = { + "*-*-darwin*", (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zFreebsd_Gcc3_BreakageSelect0[] = - "^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7$"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zFreebsd_Gcc3_BreakageBypass0[] = - "__GNUC__[ \\t]*([>=]=[ \\t]*[3-9]|>[ \\t]*2)"; +tSCC zDarwin_Stdint_5Select0[] = + "#define INTMAX_MIN[ \t]+INT64_MIN\n\ +#define INTMAX_MAX[ \t]+INT64_MAX\n\n\ +#define UINTMAX_MAX[ \t]+UINT64_MAX"; -#define FREEBSD_GCC3_BREAKAGE_TEST_CT 2 -static tTestDesc aFreebsd_Gcc3_BreakageTests[] = { - { TT_NEGREP, zFreebsd_Gcc3_BreakageBypass0, (regex_t*)NULL }, - { TT_EGREP, zFreebsd_Gcc3_BreakageSelect0, (regex_t*)NULL }, }; +#define DARWIN_STDINT_5_TEST_CT 1 +static tTestDesc aDarwin_Stdint_5Tests[] = { + { TT_EGREP, zDarwin_Stdint_5Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Freebsd_Gcc3_Breakage + * Fix Command Arguments for Darwin_Stdint_5 */ -static const char* apzFreebsd_Gcc3_BreakagePatch[] = { +static const char* apzDarwin_Stdint_5Patch[] = { "format", - "%0 || __GNUC__ >= 3", + "#if __WORDSIZE == 64\n\ +#define INTMAX_MIN (-9223372036854775807L - 1)\n\ +#define INTMAX_MAX 9223372036854775807L\n\ +#define UINTMAX_MAX 18446744073709551615UL\n\ +#else\n\ +#define INTMAX_MIN (-9223372036854775807LL - 1)\n\ +#define INTMAX_MAX 9223372036854775807LL\n\ +#define UINTMAX_MAX 18446744073709551615ULL\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Freebsd_Gcc4_Breakage fix + * Description of Darwin_Stdint_6 fix */ -tSCC zFreebsd_Gcc4_BreakageName[] = - "freebsd_gcc4_breakage"; +tSCC zDarwin_Stdint_6Name[] = + "darwin_stdint_6"; /* * File name selection pattern */ -tSCC zFreebsd_Gcc4_BreakageList[] = - "|sys/cdefs.h|"; +tSCC zDarwin_Stdint_6List[] = + "stdint-darwin.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzFreebsd_Gcc4_BreakageMachs[] = { - "*-*-freebsd*", +tSCC* apzDarwin_Stdint_6Machs[] = { + "*-*-darwin*", (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zFreebsd_Gcc4_BreakageSelect0[] = - "^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 \\|\\| __GNUC__ == 3$"; +tSCC zDarwin_Stdint_6Select0[] = + "#if __WORDSIZE == 64\n\ +#define PTRDIFF_MIN[ \t]+INT64_MIN\n\ +#define PTRDIFF_MAX[ \t]+INT64_MAX\n\ +#else\n\ +#define PTRDIFF_MIN[ \t]+INT32_MIN\n\ +#define PTRDIFF_MAX[ \t]+INT32_MAX\n\ +#endif"; -#define FREEBSD_GCC4_BREAKAGE_TEST_CT 1 -static tTestDesc aFreebsd_Gcc4_BreakageTests[] = { - { TT_EGREP, zFreebsd_Gcc4_BreakageSelect0, (regex_t*)NULL }, }; +#define DARWIN_STDINT_6_TEST_CT 1 +static tTestDesc aDarwin_Stdint_6Tests[] = { + { TT_EGREP, zDarwin_Stdint_6Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Freebsd_Gcc4_Breakage + * Fix Command Arguments for Darwin_Stdint_6 */ -static const char* apzFreebsd_Gcc4_BreakagePatch[] = { +static const char* apzDarwin_Stdint_6Patch[] = { "format", - "#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3", + "#if __WORDSIZE == 64\n\ +#define PTRDIFF_MIN (-9223372036854775807L - 1)\n\ +#define PTRDIFF_MAX 9223372036854775807L\n\ +#else\n\ +#define PTRDIFF_MIN (-2147483647 - 1)\n\ +#define PTRDIFF_MAX 2147483647\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Glibc_Mutex_Init fix + * Description of Darwin_Stdint_7 fix */ -tSCC zGlibc_Mutex_InitName[] = - "glibc_mutex_init"; +tSCC zDarwin_Stdint_7Name[] = + "darwin_stdint_7"; /* * File name selection pattern */ -tSCC zGlibc_Mutex_InitList[] = - "|pthread.h|"; +tSCC zDarwin_Stdint_7List[] = + "stdint-darwin.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -#define apzGlibc_Mutex_InitMachs (const char**)NULL +tSCC* apzDarwin_Stdint_7Machs[] = { + "*-*-darwin*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zGlibc_Mutex_InitSelect0[] = - "\\{ *\\{ *0, *\\} *\\}"; +tSCC zDarwin_Stdint_7Select0[] = + "#define INTMAX_C\\(v\\)[ \t]+\\(v ## LL\\)\n\ +#define UINTMAX_C\\(v\\)[ \t]+\\(v ## ULL\\)"; -#define GLIBC_MUTEX_INIT_TEST_CT 1 -static tTestDesc aGlibc_Mutex_InitTests[] = { - { TT_EGREP, zGlibc_Mutex_InitSelect0, (regex_t*)NULL }, }; +#define DARWIN_STDINT_7_TEST_CT 1 +static tTestDesc aDarwin_Stdint_7Tests[] = { + { TT_EGREP, zDarwin_Stdint_7Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Glibc_Mutex_Init + * Fix Command Arguments for Darwin_Stdint_7 */ -static const char* apzGlibc_Mutex_InitPatch[] = { "sed", - "-e", "/define[ \t]\\+PTHREAD_MUTEX_INITIALIZER[ \t]*\\\\/,+1s/{ { 0, } }/{ { 0, 0, 0, 0, 0, 0 } }/", - "-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 } }/", +static const char* apzDarwin_Stdint_7Patch[] = { + "format", + "#if __WORDSIZE == 64\n\ +#define INTMAX_C(v) (v ## L)\n\ +#define UINTMAX_C(v) (v ## UL)\n\ +#else\n\ +#define INTMAX_C(v) (v ## LL)\n\ +#define UINTMAX_C(v) (v ## ULL)\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Gnu_Types fix + * Description of Dec_Intern_Asm fix */ -tSCC zGnu_TypesName[] = - "gnu_types"; +tSCC zDec_Intern_AsmName[] = + "dec_intern_asm"; /* * File name selection pattern */ -tSCC zGnu_TypesList[] = - "|sys/types.h|stdlib.h|sys/stdtypes.h|stddef.h|memory.h|unistd.h|"; +tSCC zDec_Intern_AsmList[] = + "c_asm.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 }, }; +#define apzDec_Intern_AsmMachs (const char**)NULL +#define DEC_INTERN_ASM_TEST_CT 0 +#define aDec_Intern_AsmTests (tTestDesc*)NULL /* - * Fix Command Arguments for Gnu_Types + * Fix Command Arguments for Dec_Intern_Asm */ -static const char* apzGnu_TypesPatch[] = { - "gnu_type", +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\ +#endif\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hp_Inline fix + * Description of Djgpp_Wchar_H fix */ -tSCC zHp_InlineName[] = - "hp_inline"; +tSCC zDjgpp_Wchar_HName[] = + "djgpp_wchar_h"; /* * File name selection pattern */ -tSCC zHp_InlineList[] = - "|sys/spinlock.h|machine/machparam.h|"; +#define zDjgpp_Wchar_HList (char*)NULL /* * Machine/OS name selection pattern */ -#define apzHp_InlineMachs (const char**)NULL +#define apzDjgpp_Wchar_HMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHp_InlineSelect0[] = - "[ \t]*#[ \t]*include[ \t]+\"\\.\\./machine/"; +tSCC zDjgpp_Wchar_HSelect0[] = + "__DJ_wint_t"; -#define HP_INLINE_TEST_CT 1 -static tTestDesc aHp_InlineTests[] = { - { TT_EGREP, zHp_InlineSelect0, (regex_t*)NULL }, }; +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zDjgpp_Wchar_HBypass0[] = + "sys/djtypes.h"; + +#define DJGPP_WCHAR_H_TEST_CT 2 +static tTestDesc aDjgpp_Wchar_HTests[] = { + { TT_NEGREP, zDjgpp_Wchar_HBypass0, (regex_t*)NULL }, + { TT_EGREP, zDjgpp_Wchar_HSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hp_Inline + * Fix Command Arguments for Djgpp_Wchar_H */ -static const char* apzHp_InlinePatch[] = { +static const char* apzDjgpp_Wchar_HPatch[] = { "format", - "%1", - "([ \t]*#[ \t]*include[ \t]+)\"\\.\\./machine/([a-z]+)\\.h\"", + "%0\n\ +#include ", + "#include ", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hp_Sysfile fix + * Description of Ecd_Cursor fix */ -tSCC zHp_SysfileName[] = - "hp_sysfile"; +tSCC zEcd_CursorName[] = + "ecd_cursor"; /* * File name selection pattern */ -tSCC zHp_SysfileList[] = - "|sys/file.h|"; +tSCC zEcd_CursorList[] = + "sunwindow/win_lock.h\0sunwindow/win_cursor.h\0"; /* * Machine/OS name selection pattern */ -#define apzHp_SysfileMachs (const char**)NULL +#define apzEcd_CursorMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHp_SysfileSelect0[] = - "HPUX_SOURCE"; +tSCC zEcd_CursorSelect0[] = + "ecd\\.cursor"; -#define HP_SYSFILE_TEST_CT 1 -static tTestDesc aHp_SysfileTests[] = { - { TT_EGREP, zHp_SysfileSelect0, (regex_t*)NULL }, }; +#define ECD_CURSOR_TEST_CT 1 +static tTestDesc aEcd_CursorTests[] = { + { TT_EGREP, zEcd_CursorSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hp_Sysfile + * Fix Command Arguments for Ecd_Cursor */ -static const char* apzHp_SysfilePatch[] = { +static const char* apzEcd_CursorPatch[] = { "format", - "(struct file *, ...)", - "\\(\\.\\.\\.\\)", + "ecd_cursor", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux10_Cpp_Pow_Inline fix + * Description of Freebsd_Gcc3_Breakage fix */ -tSCC zHpux10_Cpp_Pow_InlineName[] = - "hpux10_cpp_pow_inline"; +tSCC zFreebsd_Gcc3_BreakageName[] = + "freebsd_gcc3_breakage"; /* * File name selection pattern */ -tSCC zHpux10_Cpp_Pow_InlineList[] = - "|fixinc-test-limits.h|math.h|"; +tSCC zFreebsd_Gcc3_BreakageList[] = + "sys/cdefs.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux10_Cpp_Pow_InlineMachs (const char**)NULL +tSCC* apzFreebsd_Gcc3_BreakageMachs[] = { + "*-*-freebsd*", + (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 zFreebsd_Gcc3_BreakageSelect0[] = + "^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7$"; -#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 zFreebsd_Gcc3_BreakageBypass0[] = + "__GNUC__[ \\t]*([>=]=[ \\t]*[3-9]|>[ \\t]*2)"; + +#define FREEBSD_GCC3_BREAKAGE_TEST_CT 2 +static tTestDesc aFreebsd_Gcc3_BreakageTests[] = { + { TT_NEGREP, zFreebsd_Gcc3_BreakageBypass0, (regex_t*)NULL }, + { TT_EGREP, zFreebsd_Gcc3_BreakageSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux10_Cpp_Pow_Inline + * Fix Command Arguments for Freebsd_Gcc3_Breakage */ -static const char* apzHpux10_Cpp_Pow_InlinePatch[] = { +static const char* apzFreebsd_Gcc3_BreakagePatch[] = { "format", - "", + "%0 || __GNUC__ >= 3", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux11_Cpp_Pow_Inline fix + * Description of Freebsd_Gcc4_Breakage fix */ -tSCC zHpux11_Cpp_Pow_InlineName[] = - "hpux11_cpp_pow_inline"; +tSCC zFreebsd_Gcc4_BreakageName[] = + "freebsd_gcc4_breakage"; /* * File name selection pattern */ -tSCC zHpux11_Cpp_Pow_InlineList[] = - "|math.h|"; +tSCC zFreebsd_Gcc4_BreakageList[] = + "sys/cdefs.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux11_Cpp_Pow_InlineMachs (const char**)NULL +tSCC* apzFreebsd_Gcc4_BreakageMachs[] = { + "*-*-freebsd*", + (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 zFreebsd_Gcc4_BreakageSelect0[] = + "^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 \\|\\| __GNUC__ == 3$"; -#define HPUX11_CPP_POW_INLINE_TEST_CT 1 -static tTestDesc aHpux11_Cpp_Pow_InlineTests[] = { - { TT_EGREP, zHpux11_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, }; +#define FREEBSD_GCC4_BREAKAGE_TEST_CT 1 +static tTestDesc aFreebsd_Gcc4_BreakageTests[] = { + { TT_EGREP, zFreebsd_Gcc4_BreakageSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux11_Cpp_Pow_Inline + * Fix Command Arguments for Freebsd_Gcc4_Breakage */ -static const char* apzHpux11_Cpp_Pow_InlinePatch[] = { +static const char* apzFreebsd_Gcc4_BreakagePatch[] = { "format", - "", + "#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux10_Ctype_Declarations1 fix + * Description of Glibc_C99_Inline_1 fix */ -tSCC zHpux10_Ctype_Declarations1Name[] = - "hpux10_ctype_declarations1"; +tSCC zGlibc_C99_Inline_1Name[] = + "glibc_c99_inline_1"; /* * File name selection pattern */ -tSCC zHpux10_Ctype_Declarations1List[] = - "|ctype.h|"; +tSCC zGlibc_C99_Inline_1List[] = + "features.h\0*/features.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux10_Ctype_Declarations1Machs (const char**)NULL +#define apzGlibc_C99_Inline_1Machs (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]*\\("; +tSCC zGlibc_C99_Inline_1Select0[] = + "^ *&& !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__$"; -#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 }, }; +#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 Hpux10_Ctype_Declarations1 + * Fix Command Arguments for Glibc_C99_Inline_1 */ -static const char* apzHpux10_Ctype_Declarations1Patch[] = { +static const char* apzGlibc_C99_Inline_1Patch[] = { "format", - "#ifdef _PROTOTYPES\n\ -extern int __tolower(int);\n\ -extern int __toupper(int);\n\ -#else /* NOT _PROTOTYPES */\n\ -extern int __tolower();\n\ -extern int __toupper();\n\ -#endif /* _PROTOTYPES */\n\n\ -%0\n", + "%0 && (defined __extern_inline || defined __GNUC_GNU_INLINE__)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux10_Ctype_Declarations2 fix + * Description of Glibc_C99_Inline_1a fix */ -tSCC zHpux10_Ctype_Declarations2Name[] = - "hpux10_ctype_declarations2"; +tSCC zGlibc_C99_Inline_1aName[] = + "glibc_c99_inline_1a"; /* * File name selection pattern */ -tSCC zHpux10_Ctype_Declarations2List[] = - "|ctype.h|"; +tSCC zGlibc_C99_Inline_1aList[] = + "features.h\0*/features.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux10_Ctype_Declarations2Machs (const char**)NULL +#define apzGlibc_C99_Inline_1aMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux10_Ctype_Declarations2Select0[] = - "^# if defined\\(_SB_CTYPE_MACROS\\) && \\!defined\\(__lint\\)"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zHpux10_Ctype_Declarations2Bypass0[] = - "^[ \t]*extern[ \t]*int[ \t]*_isalnum[ \t]*\\("; +tSCC zGlibc_C99_Inline_1aSelect0[] = + "(\\) && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__)\n\ +(#[ \t]*define[ \t]*__USE_EXTERN_INLINES[ \t]*1)"; -#define HPUX10_CTYPE_DECLARATIONS2_TEST_CT 2 -static tTestDesc aHpux10_Ctype_Declarations2Tests[] = { - { TT_NEGREP, zHpux10_Ctype_Declarations2Bypass0, (regex_t*)NULL }, - { TT_EGREP, zHpux10_Ctype_Declarations2Select0, (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 Hpux10_Ctype_Declarations2 + * Fix Command Arguments for Glibc_C99_Inline_1a */ -static const char* apzHpux10_Ctype_Declarations2Patch[] = { +static const char* apzGlibc_C99_Inline_1aPatch[] = { "format", - "%0\n\n\ -#ifdef _PROTOTYPES\n\ - extern int _isalnum(int);\n\ - extern int _isalpha(int);\n\ - extern int _iscntrl(int);\n\ - extern int _isdigit(int);\n\ - extern int _isgraph(int);\n\ - extern int _islower(int);\n\ - extern int _isprint(int);\n\ - extern int _ispunct(int);\n\ - extern int _isspace(int);\n\ - extern int _isupper(int);\n\ - extern int _isxdigit(int);\n\ -# else /* not _PROTOTYPES */\n\ - extern int _isalnum();\n\ - extern int _isalpha();\n\ - extern int _iscntrl();\n\ - extern int _isdigit();\n\ - extern int _isgraph();\n\ - extern int _islower();\n\ - extern int _isprint();\n\ - extern int _ispunct();\n\ - extern int _isspace();\n\ - extern int _isupper();\n\ - extern int _isxdigit();\n\ -#endif /* _PROTOTYPES */\n", + "%1 && (defined __extern_inline || defined __GNUC_GNU_INLINE__)\n\ +%2", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux10_Stdio_Declarations fix + * Description of Glibc_C99_Inline_2 fix */ -tSCC zHpux10_Stdio_DeclarationsName[] = - "hpux10_stdio_declarations"; +tSCC zGlibc_C99_Inline_2Name[] = + "glibc_c99_inline_2"; /* * File name selection pattern */ -tSCC zHpux10_Stdio_DeclarationsList[] = - "|stdio.h|"; +tSCC zGlibc_C99_Inline_2List[] = + "sys/stat.h\0*/sys/stat.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux10_Stdio_DeclarationsMachs (const char**)NULL +#define apzGlibc_C99_Inline_2Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux10_Stdio_DeclarationsSelect0[] = - "^#[ \t]*define _iob[ \t]*__iob"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zHpux10_Stdio_DeclarationsBypass0[] = - "^[ \t]*extern[ \t]*int[ \t]*vsnprintf[ \t]*\\("; +tSCC zGlibc_C99_Inline_2Select0[] = + "extern __inline__ int"; -#define HPUX10_STDIO_DECLARATIONS_TEST_CT 2 -static tTestDesc aHpux10_Stdio_DeclarationsTests[] = { - { TT_NEGREP, zHpux10_Stdio_DeclarationsBypass0, (regex_t*)NULL }, - { TT_EGREP, zHpux10_Stdio_DeclarationsSelect0, (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 Hpux10_Stdio_Declarations + * Fix Command Arguments for Glibc_C99_Inline_2 */ -static const char* apzHpux10_Stdio_DeclarationsPatch[] = { - "format", - "%0\n\n\ -# if defined(__STDC__) || defined(__cplusplus)\n\ - extern int snprintf(char *, size_t, const char *, ...);\n\ - extern int vsnprintf(char *, size_t, const char *, __va_list);\n\ -# else /* not __STDC__) || __cplusplus */\n\ - extern int snprintf();\n\ - extern int vsnprintf();\n\ -# endif /* __STDC__) || __cplusplus */\n", +static const char* apzGlibc_C99_Inline_2Patch[] = { sed_cmd_z, + "-e", "s/extern int \\(stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ +extern\\\n\ +#endif\\\n\ +__inline__ int \\1/", + "-e", "s/extern int \\([lf]stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ +extern\\\n\ +#endif\\\n\ +__inline__ int \\1/", + "-e", "s/extern int \\(mknod\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ +extern\\\n\ +#endif\\\n\ +__inline__ int \\1/", + "-e", "s/extern int __REDIRECT\\(_NTH\\)\\{0,1\\} (\\(stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ +extern\\\n\ +#endif\\\n\ +__inline__ int __REDIRECT\\1 (\\2/", + "-e", "s/extern int __REDIRECT\\(_NTH\\)\\{0,1\\} (\\([lf]stat\\)/#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 Hpux11_Abs fix + * Description of Glibc_C99_Inline_3 fix */ -tSCC zHpux11_AbsName[] = - "hpux11_abs"; +tSCC zGlibc_C99_Inline_3Name[] = + "glibc_c99_inline_3"; /* * File name selection pattern */ -tSCC zHpux11_AbsList[] = - "|stdlib.h|"; +tSCC zGlibc_C99_Inline_3List[] = + "bits/string2.h\0*/bits/string2.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzHpux11_AbsMachs[] = { - "ia64-hp-hpux11*", - (const char*)NULL }; +#define apzGlibc_C99_Inline_3Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux11_AbsSelect0[] = - "ifndef _MATH_INCLUDED"; +tSCC zGlibc_C99_Inline_3Select0[] = + "extern __inline"; -#define HPUX11_ABS_TEST_CT 1 -static tTestDesc aHpux11_AbsTests[] = { - { TT_EGREP, zHpux11_AbsSelect0, (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 Hpux11_Abs + * Fix Command Arguments for Glibc_C99_Inline_3 */ -static const char* apzHpux11_AbsPatch[] = { +static const char* apzGlibc_C99_Inline_3Patch[] = { "format", - "if !defined(_MATH_INCLUDED) || defined(__GNUG__)", + "# if defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)", + "^# ifdef __cplusplus$", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux11_Fabsf fix + * Description of Glibc_C99_Inline_4 fix */ -tSCC zHpux11_FabsfName[] = - "hpux11_fabsf"; +tSCC zGlibc_C99_Inline_4Name[] = + "glibc_c99_inline_4"; /* * File name selection pattern */ -tSCC zHpux11_FabsfList[] = - "|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_FabsfMachs (const char**)NULL +#define apzGlibc_C99_Inline_4Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux11_FabsfSelect0[] = - "^[ \t]*#[ \t]*define[ \t]+fabsf\\(.*"; +tSCC zGlibc_C99_Inline_4Select0[] = + "(^| )extern __inline"; /* * content bypass pattern - skip fix if pattern found */ -tSCC zHpux11_FabsfBypass0[] = - "__cplusplus"; +tSCC zGlibc_C99_Inline_4Bypass0[] = + "__extern_inline|__gnu_inline__"; -#define HPUX11_FABSF_TEST_CT 2 -static tTestDesc aHpux11_FabsfTests[] = { - { TT_NEGREP, zHpux11_FabsfBypass0, (regex_t*)NULL }, - { TT_EGREP, zHpux11_FabsfSelect0, (regex_t*)NULL }, }; +#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_Fabsf + * Fix Command Arguments for Glibc_C99_Inline_4 */ -static const char* apzHpux11_FabsfPatch[] = { +static const char* apzGlibc_C99_Inline_4Patch[] = { "format", - "#ifndef __cplusplus\n\ -%0\n\ -#endif", + "%0 __attribute__ ((__gnu_inline__))", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux11_Size_T fix + * Description of Glibc_Mutex_Init fix */ -tSCC zHpux11_Size_TName[] = - "hpux11_size_t"; +tSCC zGlibc_Mutex_InitName[] = + "glibc_mutex_init"; /* * File name selection pattern */ -#define zHpux11_Size_TList (char*)NULL +tSCC zGlibc_Mutex_InitList[] = + "pthread.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzHpux11_Size_TMachs[] = { - "*-hp-hpux11*", - (const char*)NULL }; +#define apzGlibc_Mutex_InitMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux11_Size_TSelect0[] = - "__size_t"; +tSCC zGlibc_Mutex_InitSelect0[] = + "\\{ *\\{ *0, *\\} *\\}"; -#define HPUX11_SIZE_T_TEST_CT 1 -static tTestDesc aHpux11_Size_TTests[] = { - { TT_EGREP, zHpux11_Size_TSelect0, (regex_t*)NULL }, }; +#define GLIBC_MUTEX_INIT_TEST_CT 1 +static tTestDesc aGlibc_Mutex_InitTests[] = { + { TT_EGREP, zGlibc_Mutex_InitSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux11_Size_T + * Fix Command Arguments for Glibc_Mutex_Init */ -static const char* apzHpux11_Size_TPatch[] = { - "format", - "_hpux_size_t", +static const char* apzGlibc_Mutex_InitPatch[] = { sed_cmd_z, + "-e", "/define[ \t]\\{1,\\}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\\)_NP\\) }/{ \\1, 0 }/", + "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(ERRORCHECK\\)_NP\\) }/{ \\1, 0 }/", + "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(ADAPTIVE\\)_NP\\) }/{ \\1, 0 }/", + "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\)_NP\\) }/{ \\1, 0, 0 }/", + "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(ERRORCHECK\\)_NP\\) }/{ \\1, 0, 0 }/", + "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(ADAPTIVE\\)_NP\\) }/{ \\1, 0, 0 }/", + "-e", "/define[ \t]\\{1,\\}PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\/N;s/^[ \t]*#[ \t]*\\(define[ \t]\\{1,\\}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]\\{1,\\}PTHREAD_COND_INITIALIZER/s/{ { 0, } }/{ { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }/", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux11_Snprintf fix + * Description of Glibc_Stdint fix */ -tSCC zHpux11_SnprintfName[] = - "hpux11_snprintf"; +tSCC zGlibc_StdintName[] = + "glibc_stdint"; /* * File name selection pattern */ -tSCC zHpux11_SnprintfList[] = - "|stdio.h|"; +tSCC zGlibc_StdintList[] = + "stdint.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux11_SnprintfMachs (const char**)NULL +#define apzGlibc_StdintMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux11_SnprintfSelect0[] = - "(extern int snprintf *\\(char *\\*, *(|__|_hpux_)size_t,) *(char *\\*, *\\.\\.\\.\\);)"; +tSCC zGlibc_StdintSelect0[] = + "GNU C Library"; -#define HPUX11_SNPRINTF_TEST_CT 1 -static tTestDesc aHpux11_SnprintfTests[] = { - { TT_EGREP, zHpux11_SnprintfSelect0, (regex_t*)NULL }, }; +#define GLIBC_STDINT_TEST_CT 1 +static tTestDesc aGlibc_StdintTests[] = { + { TT_EGREP, zGlibc_StdintSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux11_Snprintf + * Fix Command Arguments for Glibc_Stdint */ -static const char* apzHpux11_SnprintfPatch[] = { +static const char* apzGlibc_StdintPatch[] = { "format", - "%1 const %3", + "# define UINT8_C(c)\tc\n\ +# define UINT16_C(c)\tc", + "# define UINT8_C\\(c\\)\tc ## U\n\ +# define UINT16_C\\(c\\)\tc ## U", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux11_Uint32_C fix + * Description of Glibc_Strncpy fix */ -tSCC zHpux11_Uint32_CName[] = - "hpux11_uint32_c"; +tSCC zGlibc_StrncpyName[] = + "glibc_strncpy"; /* * File name selection pattern */ -tSCC zHpux11_Uint32_CList[] = - "|inttypes.h|"; +tSCC zGlibc_StrncpyList[] = + "bits/string2.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux11_Uint32_CMachs (const char**)NULL +#define apzGlibc_StrncpyMachs (const char**)NULL /* - * content selection pattern - do fix if pattern found + * content bypass pattern - skip fix if pattern found */ -tSCC zHpux11_Uint32_CSelect0[] = - "^#define UINT32_C\\(__c\\)[ \t]*__CONCAT__\\(__CONCAT_U__\\(__c\\),l\\)"; +tSCC zGlibc_StrncpyBypass0[] = + "__builtin_strncpy"; -#define HPUX11_UINT32_C_TEST_CT 1 -static tTestDesc aHpux11_Uint32_CTests[] = { - { TT_EGREP, zHpux11_Uint32_CSelect0, (regex_t*)NULL }, }; +#define GLIBC_STRNCPY_TEST_CT 1 +static tTestDesc aGlibc_StrncpyTests[] = { + { TT_NEGREP, zGlibc_StrncpyBypass0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux11_Uint32_C + * Fix Command Arguments for Glibc_Strncpy */ -static const char* apzHpux11_Uint32_CPatch[] = { +static const char* apzGlibc_StrncpyPatch[] = { "format", - "#define UINT32_C(__c) __CONCAT__(__c,ul)", + "# define strncpy(dest, src, n) __builtin_strncpy (dest, src, n)", + "# define strncpy([^\n\ +]*\\\\\n\ +)*[^\n\ +]*", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux11_Vsnprintf fix + * Description of Glibc_Tgmath fix */ -tSCC zHpux11_VsnprintfName[] = - "hpux11_vsnprintf"; +tSCC zGlibc_TgmathName[] = + "glibc_tgmath"; /* * File name selection pattern */ -tSCC zHpux11_VsnprintfList[] = - "|stdio.h|"; +tSCC zGlibc_TgmathList[] = + "tgmath.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux11_VsnprintfMachs (const char**)NULL +#define apzGlibc_TgmathMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux11_VsnprintfSelect0[] = - "(extern int vsnprintf\\(char \\*, _[hpux]*_size_t, const char \\*,) __va__list\\);"; +tSCC zGlibc_TgmathSelect0[] = + "\\(\\(\\(type\\) 0.25\\) && \\(\\(type\\) 0.25 - 1\\)\\)"; -#define HPUX11_VSNPRINTF_TEST_CT 1 -static tTestDesc aHpux11_VsnprintfTests[] = { - { TT_EGREP, zHpux11_VsnprintfSelect0, (regex_t*)NULL }, }; +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zGlibc_TgmathBypass0[] = + "__floating_type\\(type\\) \\\\\n\ +.*__builtin_classify_type"; + +#define GLIBC_TGMATH_TEST_CT 2 +static tTestDesc aGlibc_TgmathTests[] = { + { TT_NEGREP, zGlibc_TgmathBypass0, (regex_t*)NULL }, + { TT_EGREP, zGlibc_TgmathSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux11_Vsnprintf + * Fix Command Arguments for Glibc_Tgmath */ -static const char* apzHpux11_VsnprintfPatch[] = { +static const char* apzGlibc_TgmathPatch[] = { "format", - "%1 __va_list);", + "(__builtin_classify_type ((type) 0) == 8 || (__builtin_classify_type ((type) 0) == 9 && __builtin_classify_type (__real__ ((type) 0)) == 8))", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux8_Bogus_Inlines fix + * Description of Gnu_Types fix */ -tSCC zHpux8_Bogus_InlinesName[] = - "hpux8_bogus_inlines"; +tSCC zGnu_TypesName[] = + "gnu_types"; /* * File name selection pattern */ -tSCC zHpux8_Bogus_InlinesList[] = - "|math.h|"; +tSCC zGnu_TypesList[] = + "sys/types.h\0stdlib.h\0sys/stdtypes.h\0stddef.h\0memory.h\0unistd.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux8_Bogus_InlinesMachs (const char**)NULL +tSCC* apzGnu_TypesMachs[] = { + "*-*-solaris2.1[0-9]*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zHpux8_Bogus_InlinesSelect0[] = - "inline"; +tSCC zGnu_TypesSelect0[] = + "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;"; /* * content bypass pattern - skip fix if pattern found */ -tSCC zHpux8_Bogus_InlinesBypass0[] = - "__GNUG__"; +tSCC zGnu_TypesBypass0[] = + "_GCC_(PTRDIFF|SIZE|WCHAR)_T"; -#define HPUX8_BOGUS_INLINES_TEST_CT 2 -static tTestDesc aHpux8_Bogus_InlinesTests[] = { - { TT_NEGREP, zHpux8_Bogus_InlinesBypass0, (regex_t*)NULL }, - { TT_EGREP, zHpux8_Bogus_InlinesSelect0, (regex_t*)NULL }, }; +#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 Hpux8_Bogus_Inlines + * Fix Command Arguments for Gnu_Types */ -static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed", - "-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]*) {.*}@@", - "-e", "s@inline double sqr(double [a-z][a-z]*) {.*}@@", +static const char* apzGnu_TypesPatch[] = { + "gnu_type", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux_Ctype_Macros fix + * Description of Hp_Inline fix */ -tSCC zHpux_Ctype_MacrosName[] = - "hpux_ctype_macros"; +tSCC zHp_InlineName[] = + "hp_inline"; /* * File name selection pattern */ -tSCC zHpux_Ctype_MacrosList[] = - "|ctype.h|"; +tSCC zHp_InlineList[] = + "sys/spinlock.h\0machine/machparam.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux_Ctype_MacrosMachs (const char**)NULL +#define apzHp_InlineMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux_Ctype_MacrosSelect0[] = - "((: |\\()__SB_masks \\? )(__SB_masks\\[__(alnum|c)\\] & _IS)"; +tSCC zHp_InlineSelect0[] = + "[ \t]*#[ \t]*include[ \t]+\"\\.\\./machine/"; -#define HPUX_CTYPE_MACROS_TEST_CT 1 -static tTestDesc aHpux_Ctype_MacrosTests[] = { - { TT_EGREP, zHpux_Ctype_MacrosSelect0, (regex_t*)NULL }, }; +#define HP_INLINE_TEST_CT 1 +static tTestDesc aHp_InlineTests[] = { + { TT_EGREP, zHp_InlineSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux_Ctype_Macros + * Fix Command Arguments for Hp_Inline */ -static const char* apzHpux_Ctype_MacrosPatch[] = { +static const char* apzHp_InlinePatch[] = { "format", - "%1(int)%3", + "%1", + "([ \t]*#[ \t]*include[ \t]+)\"\\.\\./machine/([a-z]+)\\.h\"", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux_Htonl fix + * Description of Hp_Sysfile fix */ -tSCC zHpux_HtonlName[] = - "hpux_htonl"; +tSCC zHp_SysfileName[] = + "hp_sysfile"; /* * File name selection pattern */ -tSCC zHpux_HtonlList[] = - "|netinet/in.h|"; +tSCC zHp_SysfileList[] = + "sys/file.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux_HtonlMachs (const char**)NULL +#define apzHp_SysfileMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux_HtonlSelect0[] = - "#ifndef _XOPEN_SOURCE_EXTENDED\n\ -(/\\*\n\ - \\* Macros for number representation conversion\\.\n\ - \\*/\n\ -#ifndef ntohl)"; +tSCC zHp_SysfileSelect0[] = + "HPUX_SOURCE"; -#define HPUX_HTONL_TEST_CT 1 -static tTestDesc aHpux_HtonlTests[] = { - { TT_EGREP, zHpux_HtonlSelect0, (regex_t*)NULL }, }; +#define HP_SYSFILE_TEST_CT 1 +static tTestDesc aHp_SysfileTests[] = { + { TT_EGREP, zHp_SysfileSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux_Htonl + * Fix Command Arguments for Hp_Sysfile */ -static const char* apzHpux_HtonlPatch[] = { +static const char* apzHp_SysfilePatch[] = { "format", - "#if 1\n\ -%1", + "(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\ +extern int __tolower();\n\ +extern int __toupper();\n\ +#endif /* _PROTOTYPES */\n\n\ +%0\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux10_Ctype_Declarations2 fix + */ +tSCC zHpux10_Ctype_Declarations2Name[] = + "hpux10_ctype_declarations2"; + +/* + * File name selection pattern + */ +tSCC zHpux10_Ctype_Declarations2List[] = + "ctype.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzHpux10_Ctype_Declarations2Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux10_Ctype_Declarations2Select0[] = + "^# if defined\\(_SB_CTYPE_MACROS\\) && \\!defined\\(__lint\\)"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zHpux10_Ctype_Declarations2Bypass0[] = + "^[ \t]*extern[ \t]*int[ \t]*_isalnum[ \t]*\\("; + +#define HPUX10_CTYPE_DECLARATIONS2_TEST_CT 2 +static tTestDesc aHpux10_Ctype_Declarations2Tests[] = { + { TT_NEGREP, zHpux10_Ctype_Declarations2Bypass0, (regex_t*)NULL }, + { TT_EGREP, zHpux10_Ctype_Declarations2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux10_Ctype_Declarations2 + */ +static const char* apzHpux10_Ctype_Declarations2Patch[] = { + "format", + "%0\n\n\ +#ifdef _PROTOTYPES\n\ + extern int _isalnum(int);\n\ + extern int _isalpha(int);\n\ + extern int _iscntrl(int);\n\ + extern int _isdigit(int);\n\ + extern int _isgraph(int);\n\ + extern int _islower(int);\n\ + extern int _isprint(int);\n\ + extern int _ispunct(int);\n\ + extern int _isspace(int);\n\ + extern int _isupper(int);\n\ + extern int _isxdigit(int);\n\ +# else /* not _PROTOTYPES */\n\ + extern int _isalnum();\n\ + extern int _isalpha();\n\ + extern int _iscntrl();\n\ + extern int _isdigit();\n\ + extern int _isgraph();\n\ + extern int _islower();\n\ + extern int _isprint();\n\ + extern int _ispunct();\n\ + extern int _isspace();\n\ + extern int _isupper();\n\ + extern int _isxdigit();\n\ +#endif /* _PROTOTYPES */\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux10_Stdio_Declarations fix + */ +tSCC zHpux10_Stdio_DeclarationsName[] = + "hpux10_stdio_declarations"; + +/* + * File name selection pattern + */ +tSCC zHpux10_Stdio_DeclarationsList[] = + "stdio.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzHpux10_Stdio_DeclarationsMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux10_Stdio_DeclarationsSelect0[] = + "^#[ \t]*define _iob[ \t]*__iob"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zHpux10_Stdio_DeclarationsBypass0[] = + "^[ \t]*extern[ \t]*int[ \t]*vsnprintf[ \t]*\\("; + +#define HPUX10_STDIO_DECLARATIONS_TEST_CT 2 +static tTestDesc aHpux10_Stdio_DeclarationsTests[] = { + { TT_NEGREP, zHpux10_Stdio_DeclarationsBypass0, (regex_t*)NULL }, + { TT_EGREP, zHpux10_Stdio_DeclarationsSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux10_Stdio_Declarations + */ +static const char* apzHpux10_Stdio_DeclarationsPatch[] = { + "format", + "%0\n\n\ +# if defined(__STDC__) || defined(__cplusplus)\n\ + extern int snprintf(char *, size_t, const char *, ...);\n\ + extern int vsnprintf(char *, size_t, const char *, __va_list);\n\ +# else /* not __STDC__) || __cplusplus */\n\ + extern int snprintf();\n\ + extern int vsnprintf();\n\ +# endif /* __STDC__) || __cplusplus */\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux_Long_Double fix + * Description of Hpux11_Abs fix */ -tSCC zHpux_Long_DoubleName[] = - "hpux_long_double"; +tSCC zHpux11_AbsName[] = + "hpux11_abs"; /* * File name selection pattern */ -tSCC zHpux_Long_DoubleList[] = - "|stdlib.h|"; +tSCC zHpux11_AbsList[] = + "stdlib.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux_Long_DoubleMachs (const char**)NULL +tSCC* apzHpux11_AbsMachs[] = { + "ia64-hp-hpux11*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zHpux_Long_DoubleSelect0[] = - "extern[ \t]long_double[ \t]strtold"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zHpux_Long_DoubleBypass0[] = - "long_double_t"; +tSCC zHpux11_AbsSelect0[] = + "ifndef _MATH_INCLUDED"; -#define HPUX_LONG_DOUBLE_TEST_CT 2 -static tTestDesc aHpux_Long_DoubleTests[] = { - { TT_NEGREP, zHpux_Long_DoubleBypass0, (regex_t*)NULL }, - { TT_EGREP, zHpux_Long_DoubleSelect0, (regex_t*)NULL }, }; +#define HPUX11_ABS_TEST_CT 1 +static tTestDesc aHpux11_AbsTests[] = { + { TT_EGREP, zHpux11_AbsSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux_Long_Double + * Fix Command Arguments for Hpux11_Abs */ -static const char* apzHpux_Long_DoublePatch[] = { "sed", - "-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D", - "-e", "s/long_double/long double/g", +static const char* apzHpux11_AbsPatch[] = { + "format", + "if !defined(_MATH_INCLUDED) || defined(__GNUG__)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux_Systime fix + * Description of Hpux11_Fabsf fix */ -tSCC zHpux_SystimeName[] = - "hpux_systime"; +tSCC zHpux11_FabsfName[] = + "hpux11_fabsf"; /* * File name selection pattern */ -tSCC zHpux_SystimeList[] = - "|sys/time.h|"; +tSCC zHpux11_FabsfList[] = + "math.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux_SystimeMachs (const char**)NULL +#define apzHpux11_FabsfMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux_SystimeSelect0[] = - "^extern struct sigevent;"; +tSCC zHpux11_FabsfSelect0[] = + "^[ \t]*#[ \t]*define[ \t]+fabsf\\(.*"; -#define HPUX_SYSTIME_TEST_CT 1 -static tTestDesc aHpux_SystimeTests[] = { - { TT_EGREP, zHpux_SystimeSelect0, (regex_t*)NULL }, }; +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zHpux11_FabsfBypass0[] = + "__cplusplus"; + +#define HPUX11_FABSF_TEST_CT 2 +static tTestDesc aHpux11_FabsfTests[] = { + { TT_NEGREP, zHpux11_FabsfBypass0, (regex_t*)NULL }, + { TT_EGREP, zHpux11_FabsfSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux_Systime + * Fix Command Arguments for Hpux11_Fabsf */ -static const char* apzHpux_SystimePatch[] = { +static const char* apzHpux11_FabsfPatch[] = { "format", - "struct sigevent;", + "#ifndef __cplusplus\n\ +%0\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux_Spu_Info fix + * Description of Hpux11_Pthread_Const fix */ -tSCC zHpux_Spu_InfoName[] = - "hpux_spu_info"; +tSCC zHpux11_Pthread_ConstName[] = + "hpux11_pthread_const"; /* * File name selection pattern */ -tSCC zHpux_Spu_InfoList[] = - "|ia64/sys/getppdp.h|"; +tSCC zHpux11_Pthread_ConstList[] = + "sys/pthread.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzHpux_Spu_InfoMachs[] = { - "*-hp-hpux*", +tSCC* apzHpux11_Pthread_ConstMachs[] = { + "*-hp-hpux11.[0-3]*", (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zHpux_Spu_InfoSelect0[] = - "^.*extern.*spu_info.*"; +tSCC zHpux11_Pthread_ConstSelect0[] = + "^#define[ \t]*__POINTER_SET[ \t]*\\(\\(void \\*\\) 1LL\\)"; -#define HPUX_SPU_INFO_TEST_CT 1 -static tTestDesc aHpux_Spu_InfoTests[] = { - { TT_EGREP, zHpux_Spu_InfoSelect0, (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 Hpux_Spu_Info + * Fix Command Arguments for Hpux11_Pthread_Const */ -static const char* apzHpux_Spu_InfoPatch[] = { +static const char* apzHpux11_Pthread_ConstPatch[] = { "format", - "#ifdef _KERNEL\n\ -%0\n\ -#endif", + "#define __POINTER_SET\t\t((void *) 1L)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux_Extern_Errno fix + * Description of Hpux11_Size_T fix */ -tSCC zHpux_Extern_ErrnoName[] = - "hpux_extern_errno"; +tSCC zHpux11_Size_TName[] = + "hpux11_size_t"; /* * File name selection pattern */ -tSCC zHpux_Extern_ErrnoList[] = - "|errno.h|"; +#define zHpux11_Size_TList (char*)NULL /* * Machine/OS name selection pattern */ -tSCC* apzHpux_Extern_ErrnoMachs[] = { - "*-hp-hpux10.*", - "*-hp-hpux11.[0-2]*", +tSCC* apzHpux11_Size_TMachs[] = { + "*-hp-hpux11*", (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zHpux_Extern_ErrnoSelect0[] = - "^[ \t]*extern int errno;$"; +tSCC zHpux11_Size_TSelect0[] = + "__size_t"; -#define HPUX_EXTERN_ERRNO_TEST_CT 1 -static tTestDesc aHpux_Extern_ErrnoTests[] = { - { TT_EGREP, zHpux_Extern_ErrnoSelect0, (regex_t*)NULL }, }; +#define HPUX11_SIZE_T_TEST_CT 1 +static tTestDesc aHpux11_Size_TTests[] = { + { TT_EGREP, zHpux11_Size_TSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux_Extern_Errno + * Fix Command Arguments for Hpux11_Size_T */ -static const char* apzHpux_Extern_ErrnoPatch[] = { +static const char* apzHpux11_Size_TPatch[] = { "format", - "#ifdef __cplusplus\n\ -extern \"C\" {\n\ -#endif\n\ -%0\n\ -#ifdef __cplusplus\n\ -}\n\ -#endif", + "_hpux_size_t", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux_Pthread_Initializers fix + * Description of Hpux11_Snprintf fix */ -tSCC zHpux_Pthread_InitializersName[] = - "hpux_pthread_initializers"; +tSCC zHpux11_SnprintfName[] = + "hpux11_snprintf"; /* * File name selection pattern */ -tSCC zHpux_Pthread_InitializersList[] = - "|sys/pthread.h|"; +tSCC zHpux11_SnprintfList[] = + "stdio.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 +#define apzHpux11_SnprintfMachs (const char**)NULL /* - * Fix Command Arguments for Hpux_Pthread_Initializers + * content selection pattern - do fix if pattern found */ -static const char* apzHpux_Pthread_InitializersPatch[] = { "sed", - "-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\\\\@", +tSCC zHpux11_SnprintfSelect0[] = + "(extern int snprintf *\\(char *\\*, *(|__|_hpux_)size_t,) *(char *\\*, *\\.\\.\\.\\);)"; + +#define HPUX11_SNPRINTF_TEST_CT 1 +static tTestDesc aHpux11_SnprintfTests[] = { + { TT_EGREP, zHpux11_SnprintfSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux11_Snprintf + */ +static const char* apzHpux11_SnprintfPatch[] = { + "format", + "%1 const %3", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Huge_Val_Hex fix + * Description of Hpux11_Vsnprintf fix */ -tSCC zHuge_Val_HexName[] = - "huge_val_hex"; +tSCC zHpux11_VsnprintfName[] = + "hpux11_vsnprintf"; /* * File name selection pattern */ -tSCC zHuge_Val_HexList[] = - "|bits/huge_val.h|"; +tSCC zHpux11_VsnprintfList[] = + "stdio.h\0"; /* * Machine/OS name selection pattern */ -#define apzHuge_Val_HexMachs (const char**)NULL +#define apzHpux11_VsnprintfMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHuge_Val_HexSelect0[] = - "^#[ \t]*define[ \t]*HUGE_VAL[ \t].*0x1\\.0p.*"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zHuge_Val_HexBypass0[] = - "__builtin_huge_val"; +tSCC zHpux11_VsnprintfSelect0[] = + "(extern int vsnprintf\\(char \\*, _[hpux]*_size_t, const char \\*,) __va__list\\);"; -#define HUGE_VAL_HEX_TEST_CT 2 -static tTestDesc aHuge_Val_HexTests[] = { - { TT_NEGREP, zHuge_Val_HexBypass0, (regex_t*)NULL }, - { TT_EGREP, zHuge_Val_HexSelect0, (regex_t*)NULL }, }; +#define HPUX11_VSNPRINTF_TEST_CT 1 +static tTestDesc aHpux11_VsnprintfTests[] = { + { TT_EGREP, zHpux11_VsnprintfSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Huge_Val_Hex + * Fix Command Arguments for Hpux11_Vsnprintf */ -static const char* apzHuge_Val_HexPatch[] = { +static const char* apzHpux11_VsnprintfPatch[] = { "format", - "#define HUGE_VAL (__builtin_huge_val())\n", + "%1 __va_list);", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Huge_Valf_Hex fix + * Description of Hpux8_Bogus_Inlines fix */ -tSCC zHuge_Valf_HexName[] = - "huge_valf_hex"; +tSCC zHpux8_Bogus_InlinesName[] = + "hpux8_bogus_inlines"; /* * File name selection pattern */ -tSCC zHuge_Valf_HexList[] = - "|bits/huge_val.h|"; +tSCC zHpux8_Bogus_InlinesList[] = + "math.h\0"; /* * Machine/OS name selection pattern */ -#define apzHuge_Valf_HexMachs (const char**)NULL +#define apzHpux8_Bogus_InlinesMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHuge_Valf_HexSelect0[] = - "^#[ \t]*define[ \t]*HUGE_VALF[ \t].*0x1\\.0p.*"; +tSCC zHpux8_Bogus_InlinesSelect0[] = + "inline"; /* * content bypass pattern - skip fix if pattern found */ -tSCC zHuge_Valf_HexBypass0[] = - "__builtin_huge_valf"; +tSCC zHpux8_Bogus_InlinesBypass0[] = + "__GNUG__"; -#define HUGE_VALF_HEX_TEST_CT 2 -static tTestDesc aHuge_Valf_HexTests[] = { - { TT_NEGREP, zHuge_Valf_HexBypass0, (regex_t*)NULL }, - { TT_EGREP, zHuge_Valf_HexSelect0, (regex_t*)NULL }, }; +#define HPUX8_BOGUS_INLINES_TEST_CT 2 +static tTestDesc aHpux8_Bogus_InlinesTests[] = { + { TT_NEGREP, zHpux8_Bogus_InlinesBypass0, (regex_t*)NULL }, + { TT_EGREP, zHpux8_Bogus_InlinesSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Huge_Valf_Hex + * Fix Command Arguments for Hpux8_Bogus_Inlines */ -static const char* apzHuge_Valf_HexPatch[] = { - "format", - "#define HUGE_VALF (__builtin_huge_valf())\n", +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]*) {.*}@@", + "-e", "s@inline double sqr(double [a-z][a-z]*) {.*}@@", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Huge_Vall_Hex fix + * Description of Hpux_Ctype_Macros fix */ -tSCC zHuge_Vall_HexName[] = - "huge_vall_hex"; +tSCC zHpux_Ctype_MacrosName[] = + "hpux_ctype_macros"; /* * File name selection pattern */ -tSCC zHuge_Vall_HexList[] = - "|bits/huge_val.h|"; +tSCC zHpux_Ctype_MacrosList[] = + "ctype.h\0"; /* * Machine/OS name selection pattern */ -#define apzHuge_Vall_HexMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zHuge_Vall_HexSelect0[] = - "^#[ \t]*define[ \t]*HUGE_VALL[ \t].*0x1\\.0p.*"; +#define apzHpux_Ctype_MacrosMachs (const char**)NULL /* - * content bypass pattern - skip fix if pattern found + * content selection pattern - do fix if pattern found */ -tSCC zHuge_Vall_HexBypass0[] = - "__builtin_huge_vall"; +tSCC zHpux_Ctype_MacrosSelect0[] = + "((: |\\()__SB_masks \\? )(__SB_masks\\[__(alnum|c)\\] & _IS)"; -#define HUGE_VALL_HEX_TEST_CT 2 -static tTestDesc aHuge_Vall_HexTests[] = { - { TT_NEGREP, zHuge_Vall_HexBypass0, (regex_t*)NULL }, - { TT_EGREP, zHuge_Vall_HexSelect0, (regex_t*)NULL }, }; +#define HPUX_CTYPE_MACROS_TEST_CT 1 +static tTestDesc aHpux_Ctype_MacrosTests[] = { + { TT_EGREP, zHpux_Ctype_MacrosSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Huge_Vall_Hex + * Fix Command Arguments for Hpux_Ctype_Macros */ -static const char* apzHuge_Vall_HexPatch[] = { +static const char* apzHpux_Ctype_MacrosPatch[] = { "format", - "#define HUGE_VALL (__builtin_huge_vall())\n", + "%1(int)%3", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Int_Abort_Free_And_Exit fix + * Description of Hpux_Htonl fix */ -tSCC zInt_Abort_Free_And_ExitName[] = - "int_abort_free_and_exit"; +tSCC zHpux_HtonlName[] = + "hpux_htonl"; /* * File name selection pattern */ -tSCC zInt_Abort_Free_And_ExitList[] = - "|stdlib.h|"; +tSCC zHpux_HtonlList[] = + "netinet/in.h\0"; /* * Machine/OS name selection pattern */ -#define apzInt_Abort_Free_And_ExitMachs (const char**)NULL +#define apzHpux_HtonlMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zInt_Abort_Free_And_ExitSelect0[] = - "int[ \t]+(abort|free|exit)[ \t]*\\("; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zInt_Abort_Free_And_ExitBypass0[] = - "_CLASSIC_ANSI_TYPES"; +tSCC zHpux_HtonlSelect0[] = + "#ifndef _XOPEN_SOURCE_EXTENDED[ \t]*\n\ +(/\\*\n\ + \\* Macros for number representation conversion\\.\n\ + \\*/\n\ +#ifndef ntohl)"; -#define INT_ABORT_FREE_AND_EXIT_TEST_CT 2 -static tTestDesc aInt_Abort_Free_And_ExitTests[] = { - { TT_NEGREP, zInt_Abort_Free_And_ExitBypass0, (regex_t*)NULL }, - { TT_EGREP, zInt_Abort_Free_And_ExitSelect0, (regex_t*)NULL }, }; +#define HPUX_HTONL_TEST_CT 1 +static tTestDesc aHpux_HtonlTests[] = { + { TT_EGREP, zHpux_HtonlSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Int_Abort_Free_And_Exit + * Fix Command Arguments for Hpux_Htonl */ -static const char* apzInt_Abort_Free_And_ExitPatch[] = { +static const char* apzHpux_HtonlPatch[] = { "format", - "void\t%1(", + "#if 1\n\ +%1", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Io_Quotes_Def fix + * Description of Hpux_Long_Double fix */ -tSCC zIo_Quotes_DefName[] = - "io_quotes_def"; +tSCC zHpux_Long_DoubleName[] = + "hpux_long_double"; /* * File name selection pattern */ -#define zIo_Quotes_DefList (char*)NULL +tSCC zHpux_Long_DoubleList[] = + "stdlib.h\0"; /* * Machine/OS name selection pattern */ -#define apzIo_Quotes_DefMachs (const char**)NULL +tSCC* apzHpux_Long_DoubleMachs[] = { + "*-*-hpux10*", + "*-*-hpux11.[012]*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zIo_Quotes_DefSelect0[] = - "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\([a-zA-Z][,)]"; +tSCC zHpux_Long_DoubleSelect0[] = + "extern[ \t]long_double[ \t]strtold"; -#define IO_QUOTES_DEF_TEST_CT 1 -static tTestDesc aIo_Quotes_DefTests[] = { - { TT_EGREP, zIo_Quotes_DefSelect0, (regex_t*)NULL }, }; +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zHpux_Long_DoubleBypass0[] = + "long_double_t"; + +#define HPUX_LONG_DOUBLE_TEST_CT 2 +static tTestDesc aHpux_Long_DoubleTests[] = { + { TT_NEGREP, zHpux_Long_DoubleBypass0, (regex_t*)NULL }, + { TT_EGREP, zHpux_Long_DoubleSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Io_Quotes_Def + * Fix Command Arguments for Hpux_Long_Double */ -static const char* apzIo_Quotes_DefPatch[] = { - "char_macro_def", - "IO", +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 }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Io_Quotes_Use fix + * Description of Hpux_Long_Double_2 fix */ -tSCC zIo_Quotes_UseName[] = - "io_quotes_use"; +tSCC zHpux_Long_Double_2Name[] = + "hpux_long_double_2"; /* * File name selection pattern */ -#define zIo_Quotes_UseList (char*)NULL +tSCC zHpux_Long_Double_2List[] = + "stdlib.h\0"; /* * Machine/OS name selection pattern */ -#define apzIo_Quotes_UseMachs (const char**)NULL +tSCC* apzHpux_Long_Double_2Machs[] = { + "hppa*-*-hpux11.3*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zIo_Quotes_UseSelect0[] = - "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+IO[A-Z]*[ \t]*\\( *[^,']"; +tSCC zHpux_Long_Double_2Select0[] = + "#[ \t]*if[ \t]*!defined\\(__ia64\\) \\|\\| defined\\(_PROTOTYPES\\) \\|\\| defined\\(_LONG_DOUBLE_STRUCT\\)"; -#define IO_QUOTES_USE_TEST_CT 1 -static tTestDesc aIo_Quotes_UseTests[] = { - { TT_EGREP, zIo_Quotes_UseSelect0, (regex_t*)NULL }, }; +#define HPUX_LONG_DOUBLE_2_TEST_CT 1 +static tTestDesc aHpux_Long_Double_2Tests[] = { + { TT_EGREP, zHpux_Long_Double_2Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Io_Quotes_Use + * Fix Command Arguments for Hpux_Long_Double_2 */ -static const char* apzIo_Quotes_UsePatch[] = { - "char_macro_use", - "IO", +static const char* apzHpux_Long_Double_2Patch[] = { + "format", + "# if !defined(_PROTOTYPES) || defined(_LONG_DOUBLE_STRUCT)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ip_Missing_Semi fix + * Description of Hpux_Systime fix */ -tSCC zIp_Missing_SemiName[] = - "ip_missing_semi"; +tSCC zHpux_SystimeName[] = + "hpux_systime"; /* * File name selection pattern */ -tSCC zIp_Missing_SemiList[] = - "|netinet/ip.h|"; +tSCC zHpux_SystimeList[] = + "sys/time.h\0"; /* * Machine/OS name selection pattern */ -#define apzIp_Missing_SemiMachs (const char**)NULL +#define apzHpux_SystimeMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zIp_Missing_SemiSelect0[] = - "}$"; +tSCC zHpux_SystimeSelect0[] = + "^extern struct sigevent;"; -#define IP_MISSING_SEMI_TEST_CT 1 -static tTestDesc aIp_Missing_SemiTests[] = { - { TT_EGREP, zIp_Missing_SemiSelect0, (regex_t*)NULL }, }; +#define HPUX_SYSTIME_TEST_CT 1 +static tTestDesc aHpux_SystimeTests[] = { + { TT_EGREP, zHpux_SystimeSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ip_Missing_Semi + * Fix Command Arguments for Hpux_Systime */ -static const char* apzIp_Missing_SemiPatch[] = { "sed", - "-e", "/^struct/,/^};/s/}$/};/", +static const char* apzHpux_SystimePatch[] = { + "format", + "struct sigevent;", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Irix___Restrict fix + * Description of Hpux_Spu_Info fix */ -tSCC zIrix___RestrictName[] = - "irix___restrict"; +tSCC zHpux_Spu_InfoName[] = + "hpux_spu_info"; /* * File name selection pattern */ -tSCC zIrix___RestrictList[] = - "|internal/sgimacros.h|"; +tSCC zHpux_Spu_InfoList[] = + "ia64/sys/getppdp.h\0*/sys/getppdp.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzIrix___RestrictMachs[] = { - "mips-sgi-irix6.5", +tSCC* apzHpux_Spu_InfoMachs[] = { + "*-hp-hpux*", (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zIrix___RestrictSelect0[] = - "(#ifdef __c99\n\ -)(#[ \t]*define __restrict restrict)"; +tSCC zHpux_Spu_InfoSelect0[] = + "^.*extern.*spu_info.*"; -#define IRIX___RESTRICT_TEST_CT 1 -static tTestDesc aIrix___RestrictTests[] = { - { TT_EGREP, zIrix___RestrictSelect0, (regex_t*)NULL }, }; +#define HPUX_SPU_INFO_TEST_CT 1 +static tTestDesc aHpux_Spu_InfoTests[] = { + { TT_EGREP, zHpux_Spu_InfoSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Irix___Restrict + * Fix Command Arguments for Hpux_Spu_Info */ -static const char* apzIrix___RestrictPatch[] = { +static const char* apzHpux_Spu_InfoPatch[] = { "format", - "%1# ifndef __cplusplus\n\ -%2\n\ -# endif", + "#ifdef _KERNEL\n\ +%0\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Irix___Generic1 fix + * Description of Hpux11_Extern_Sendfile fix */ -tSCC zIrix___Generic1Name[] = - "irix___generic1"; +tSCC zHpux11_Extern_SendfileName[] = + "hpux11_extern_sendfile"; /* * File name selection pattern */ -tSCC zIrix___Generic1List[] = - "|internal/math_core.h|"; +tSCC zHpux11_Extern_SendfileList[] = + "sys/socket.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzIrix___Generic1Machs[] = { - "mips-sgi-irix6.5", +tSCC* apzHpux11_Extern_SendfileMachs[] = { + "*-hp-hpux11.[12]*", (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zIrix___Generic1Select0[] = - "#define ([a-z]+)\\(x\\) *__generic.*"; +tSCC zHpux11_Extern_SendfileSelect0[] = + "^[ \t]*extern sbsize_t sendfile.*\n\ +.*, int\\)\\);\n"; -#define IRIX___GENERIC1_TEST_CT 1 -static tTestDesc aIrix___Generic1Tests[] = { - { TT_EGREP, zIrix___Generic1Select0, (regex_t*)NULL }, }; +#define HPUX11_EXTERN_SENDFILE_TEST_CT 1 +static tTestDesc aHpux11_Extern_SendfileTests[] = { + { TT_EGREP, zHpux11_Extern_SendfileSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Irix___Generic1 + * Fix Command Arguments for Hpux11_Extern_Sendfile */ -static const char* apzIrix___Generic1Patch[] = { +static const char* apzHpux11_Extern_SendfilePatch[] = { "format", - "extern int %1(double);\n\ -extern int %1f(float);\n\ -extern int %1l(long double);\n\ -#define %1(x) (sizeof(x) == sizeof(double) ? _%1(x) \\\n\ - : sizeof(x) == sizeof(float) ? _%1f(x) \\\n\ - : _%1l(x))\n", + "#ifndef _APP32_64BIT_OFF_T\n\ +%0#endif\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Irix___Generic2 fix + * Description of Hpux11_Extern_Sendpath fix */ -tSCC zIrix___Generic2Name[] = - "irix___generic2"; +tSCC zHpux11_Extern_SendpathName[] = + "hpux11_extern_sendpath"; /* * File name selection pattern */ -tSCC zIrix___Generic2List[] = - "|internal/math_core.h|"; +tSCC zHpux11_Extern_SendpathList[] = + "sys/socket.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzIrix___Generic2Machs[] = { - "mips-sgi-irix6.5", +tSCC* apzHpux11_Extern_SendpathMachs[] = { + "*-hp-hpux11.[12]*", (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zIrix___Generic2Select0[] = - "#define ([a-z]+)\\(x,y\\) *__generic.*"; +tSCC zHpux11_Extern_SendpathSelect0[] = + "^[ \t]*extern sbsize_t sendpath.*\n\ +.*, int\\)\\);\n"; -#define IRIX___GENERIC2_TEST_CT 1 -static tTestDesc aIrix___Generic2Tests[] = { - { TT_EGREP, zIrix___Generic2Select0, (regex_t*)NULL }, }; +#define HPUX11_EXTERN_SENDPATH_TEST_CT 1 +static tTestDesc aHpux11_Extern_SendpathTests[] = { + { TT_EGREP, zHpux11_Extern_SendpathSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Irix___Generic2 + * Fix Command Arguments for Hpux11_Extern_Sendpath */ -static const char* apzIrix___Generic2Patch[] = { +static const char* apzHpux11_Extern_SendpathPatch[] = { "format", - "#define %1(x,y) \\\n\ - ((sizeof(x)<=4 && sizeof(y)<=4) ? _%1f(x,y) \\\n\ - : (sizeof(x)<=8 && sizeof(y)<=8) ? _%1(x,y) \\\n\ - : _%1l(x,y))\n", + "#ifndef _APP32_64BIT_OFF_T\n\ +%0#endif\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Irix_Asm_Apostrophe fix + * Description of Hpux_Extern_Errno fix */ -tSCC zIrix_Asm_ApostropheName[] = - "irix_asm_apostrophe"; +tSCC zHpux_Extern_ErrnoName[] = + "hpux_extern_errno"; /* * File name selection pattern */ -tSCC zIrix_Asm_ApostropheList[] = - "|sys/asm.h|"; +tSCC zHpux_Extern_ErrnoList[] = + "errno.h\0"; /* * Machine/OS name selection pattern */ -#define apzIrix_Asm_ApostropheMachs (const char**)NULL +tSCC* apzHpux_Extern_ErrnoMachs[] = { + "*-hp-hpux10.*", + "*-hp-hpux11.[0-2]*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zIrix_Asm_ApostropheSelect0[] = - "^[ \t]*#.*[Ww]e're"; +tSCC zHpux_Extern_ErrnoSelect0[] = + "^[ \t]*extern int errno;$"; -#define IRIX_ASM_APOSTROPHE_TEST_CT 1 -static tTestDesc aIrix_Asm_ApostropheTests[] = { - { TT_EGREP, zIrix_Asm_ApostropheSelect0, (regex_t*)NULL }, }; +#define HPUX_EXTERN_ERRNO_TEST_CT 1 +static tTestDesc aHpux_Extern_ErrnoTests[] = { + { TT_EGREP, zHpux_Extern_ErrnoSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Irix_Asm_Apostrophe + * Fix Command Arguments for Hpux_Extern_Errno */ -static const char* apzIrix_Asm_ApostrophePatch[] = { +static const char* apzHpux_Extern_ErrnoPatch[] = { "format", - "%1 are", - "^([ \t]*#.*[Ww]e)'re", + "#ifdef __cplusplus\n\ +extern \"C\" {\n\ +#endif\n\ +%0\n\ +#ifdef __cplusplus\n\ +}\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Irix_Limits_Const fix + * Description of Hpux_Pthread_Initializers fix */ -tSCC zIrix_Limits_ConstName[] = - "irix_limits_const"; +tSCC zHpux_Pthread_InitializersName[] = + "hpux_pthread_initializers"; /* * File name selection pattern */ -tSCC zIrix_Limits_ConstList[] = - "|fixinc-test-limits.h|limits.h|"; +tSCC zHpux_Pthread_InitializersList[] = + "sys/pthread.h\0"; /* * Machine/OS name selection pattern */ -#define apzIrix_Limits_ConstMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zIrix_Limits_ConstSelect0[] = - "^extern const "; - -#define IRIX_LIMITS_CONST_TEST_CT 1 -static tTestDesc aIrix_Limits_ConstTests[] = { - { TT_EGREP, zIrix_Limits_ConstSelect0, (regex_t*)NULL }, }; +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 Irix_Limits_Const + * Fix Command Arguments for Hpux_Pthread_Initializers */ -static const char* apzIrix_Limits_ConstPatch[] = { - "format", - "extern __const ", +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 Irix_Socklen_T fix + * Description of Hpux_C99_Intptr fix */ -tSCC zIrix_Socklen_TName[] = - "irix_socklen_t"; +tSCC zHpux_C99_IntptrName[] = + "hpux_c99_intptr"; /* * File name selection pattern */ -tSCC zIrix_Socklen_TList[] = - "|sys/socket.h|"; +tSCC zHpux_C99_IntptrList[] = + "stdint-hpux11.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzIrix_Socklen_TMachs[] = { - "mips-sgi-irix6.5", +tSCC* apzHpux_C99_IntptrMachs[] = { + "*-hp-hpux11.3*", (const char*)NULL }; +#define HPUX_C99_INTPTR_TEST_CT 0 +#define aHpux_C99_IntptrTests (tTestDesc*)NULL /* - * content selection pattern - do fix if pattern found - */ -tSCC zIrix_Socklen_TSelect0[] = - "(#define _SOCKLEN_T\n\ -)(typedef u_int32_t socklen_t;)"; - -#define IRIX_SOCKLEN_T_TEST_CT 1 -static tTestDesc aIrix_Socklen_TTests[] = { - { TT_EGREP, zIrix_Socklen_TSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Irix_Socklen_T + * Fix Command Arguments for Hpux_C99_Intptr */ -static const char* apzIrix_Socklen_TPatch[] = { - "format", - "%1#if _NO_XOPEN4 && _NO_XOPEN5\n\ -typedef int socklen_t;\n\ -#else\n\ -%2\n\ -#endif /* _NO_XOPEN4 && _NO_XOPEN5 */", +static const char* apzHpux_C99_IntptrPatch[] = { sed_cmd_z, + "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MAX[ \t]*INT32_MAX[ \t]*$@#define PTRDIFF_MAX (2147483647l)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MIN[ \t]*INT32_MIN[ \t]*$@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MAX[ \t]*INT32_MAX[ \t]*$@#define INTPTR_MAX (2147483647l)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MIN[ \t]*INT32_MIN[ \t]*$@#define INTPTR_MIN (-INTPTR_MAX - 1)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINTPTR_MAX[ \t]*UINT32_MAX[ \t]*$@#define UINTPTR_MAX (4294967295ul)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*SIZE_MAX[ \t]*UINT32_MAX[ \t]*$@#define SIZE_MAX (4294967295ul)@", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Irix_Stdio_Va_List fix + * Description of Hpux_C99_Inttypes fix */ -tSCC zIrix_Stdio_Va_ListName[] = - "irix_stdio_va_list"; +tSCC zHpux_C99_InttypesName[] = + "hpux_c99_inttypes"; /* * File name selection pattern */ -tSCC zIrix_Stdio_Va_ListList[] = - "|stdio.h|internal/stdio_core.h|"; +tSCC zHpux_C99_InttypesList[] = + "inttypes.h\0stdint-hpux11.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -#define apzIrix_Stdio_Va_ListMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zIrix_Stdio_Va_ListSelect0[] = - "/\\* va_list \\*/ char \\*"; - -#define IRIX_STDIO_VA_LIST_TEST_CT 1 -static tTestDesc aIrix_Stdio_Va_ListTests[] = { - { TT_EGREP, zIrix_Stdio_Va_ListSelect0, (regex_t*)NULL }, }; +tSCC* apzHpux_C99_InttypesMachs[] = { + "*-hp-hpux11.[23]*", + (const char*)NULL }; +#define HPUX_C99_INTTYPES_TEST_CT 0 +#define aHpux_C99_InttypesTests (tTestDesc*)NULL /* - * Fix Command Arguments for Irix_Stdio_Va_List + * Fix Command Arguments for Hpux_C99_Inttypes */ -static const char* apzIrix_Stdio_Va_ListPatch[] = { - "format", - "__gnuc_va_list", +static const char* apzHpux_C99_InttypesPatch[] = { sed_cmd_z, + "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT8_C(__c) (__c)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT16_C(__c) (__c)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT32_C(__c)[ \t]*__CONCAT__(__c,l)[ \t]*$@#define INT32_C(__c) (__c)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT32_C(__c)[ \t].*$@#define UINT32_C(__c) __CONCAT__(__c,u)@", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Irix_Wcsftime fix + * Description of Hpux_C99_Inttypes2 fix */ -tSCC zIrix_WcsftimeName[] = - "irix_wcsftime"; +tSCC zHpux_C99_Inttypes2Name[] = + "hpux_c99_inttypes2"; /* * File name selection pattern */ -tSCC zIrix_WcsftimeList[] = - "|internal/wchar_core.h|"; +tSCC zHpux_C99_Inttypes2List[] = + "stdint-hpux11.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzIrix_WcsftimeMachs[] = { - "mips-sgi-irix6.5", +tSCC* apzHpux_C99_Inttypes2Machs[] = { + "*-hp-hpux11.2*", (const char*)NULL }; +#define HPUX_C99_INTTYPES2_TEST_CT 0 +#define aHpux_C99_Inttypes2Tests (tTestDesc*)NULL /* - * content selection pattern - do fix if pattern found - */ -tSCC zIrix_WcsftimeSelect0[] = - "#if _NO_XOPEN5\n\ -(extern size_t[ \t]+wcsftime.*const char *.*)"; - -#define IRIX_WCSFTIME_TEST_CT 1 -static tTestDesc aIrix_WcsftimeTests[] = { - { TT_EGREP, zIrix_WcsftimeSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Irix_Wcsftime + * Fix Command Arguments for Hpux_C99_Inttypes2 */ -static const char* apzIrix_WcsftimePatch[] = { - "format", - "#if _NO_XOPEN5 && !defined(__c99)\n\ -%1", +static const char* apzHpux_C99_Inttypes2Patch[] = { sed_cmd_z, + "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT8_C(__c)[ \t]*((signed char)(__c))[ \t]*$@#define INT8_C(__c) (__c)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*((unsigned char)(__c))[ \t]*$@#define UINT8_C(__c) (__c)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT16_C(__c)[ \t]*((short)(__c))[ \t]*$@#define INT16_C(__c) (__c)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*((unsigned short)(__c))[ \t]*$@#define UINT16_C(__c) (__c)@", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Isc_Fmod fix + * Description of Hpux_Stdint_Least_Fast fix */ -tSCC zIsc_FmodName[] = - "isc_fmod"; +tSCC zHpux_Stdint_Least_FastName[] = + "hpux_stdint_least_fast"; /* * File name selection pattern */ -tSCC zIsc_FmodList[] = - "|math.h|"; +tSCC zHpux_Stdint_Least_FastList[] = + "stdint-hpux11.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -#define apzIsc_FmodMachs (const char**)NULL +tSCC* apzHpux_Stdint_Least_FastMachs[] = { + "*-hp-hpux11.2*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zIsc_FmodSelect0[] = - "fmod\\(double\\)"; +tSCC zHpux_Stdint_Least_FastSelect0[] = + "^[ \t]*#[ \t]*define[ \t]+UINT_(LEAST|FAST)64_MAX[ \t]+ULLONG_MAX"; -#define ISC_FMOD_TEST_CT 1 -static tTestDesc aIsc_FmodTests[] = { - { TT_EGREP, zIsc_FmodSelect0, (regex_t*)NULL }, }; +#define HPUX_STDINT_LEAST_FAST_TEST_CT 1 +static tTestDesc aHpux_Stdint_Least_FastTests[] = { + { TT_EGREP, zHpux_Stdint_Least_FastSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Isc_Fmod + * Fix Command Arguments for Hpux_Stdint_Least_Fast */ -static const char* apzIsc_FmodPatch[] = { +static const char* apzHpux_Stdint_Least_FastPatch[] = { "format", - "fmod(double, double)", + "# define\tUINT_%164_MAX\t__UINT64_MAX__", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Isc_Omits_With_Stdc fix + * Description of Hpux_Inttype_Int8_T fix */ -tSCC zIsc_Omits_With_StdcName[] = - "isc_omits_with_stdc"; +tSCC zHpux_Inttype_Int8_TName[] = + "hpux_inttype_int8_t"; /* * File name selection pattern */ -tSCC zIsc_Omits_With_StdcList[] = - "|stdio.h|math.h|ctype.h|sys/limits.h|sys/fcntl.h|sys/dirent.h|"; +tSCC zHpux_Inttype_Int8_TList[] = + "sys/_inttypes.h\0"; /* * Machine/OS name selection pattern */ -#define apzIsc_Omits_With_StdcMachs (const char**)NULL +tSCC* apzHpux_Inttype_Int8_TMachs[] = { + "*-hp-hpux1[01].*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zIsc_Omits_With_StdcSelect0[] = - "!defined\\(__STDC__\\) && !defined\\(_POSIX_SOURCE\\)"; +tSCC zHpux_Inttype_Int8_TSelect0[] = + "^[ \t]*typedef[ \t]*char[ \t]*int(_least){0,1}8_t.*"; -#define ISC_OMITS_WITH_STDC_TEST_CT 1 -static tTestDesc aIsc_Omits_With_StdcTests[] = { - { TT_EGREP, zIsc_Omits_With_StdcSelect0, (regex_t*)NULL }, }; +#define HPUX_INTTYPE_INT8_T_TEST_CT 1 +static tTestDesc aHpux_Inttype_Int8_TTests[] = { + { TT_EGREP, zHpux_Inttype_Int8_TSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Isc_Omits_With_Stdc + * Fix Command Arguments for Hpux_Inttype_Int8_T */ -static const char* apzIsc_Omits_With_StdcPatch[] = { +static const char* apzHpux_Inttype_Int8_TPatch[] = { "format", - "!defined(_POSIX_SOURCE)", + "typedef signed char int%18_t;", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Kandr_Concat fix + * Description of Hpux_Imaginary_I fix */ -tSCC zKandr_ConcatName[] = - "kandr_concat"; +tSCC zHpux_Imaginary_IName[] = + "hpux_imaginary_i"; /* * 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|"; +tSCC zHpux_Imaginary_IList[] = + "complex.h\0"; /* * Machine/OS name selection pattern */ -#define apzKandr_ConcatMachs (const char**)NULL +tSCC* apzHpux_Imaginary_IMachs[] = { + "ia64-hp-hpux11.*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zKandr_ConcatSelect0[] = - "/\\*\\*/"; +tSCC zHpux_Imaginary_ISelect0[] = + "^[ \t]*#[ \t]*define[ \t]*_Complex_I.*"; -#define KANDR_CONCAT_TEST_CT 1 -static tTestDesc aKandr_ConcatTests[] = { - { TT_EGREP, zKandr_ConcatSelect0, (regex_t*)NULL }, }; +#define HPUX_IMAGINARY_I_TEST_CT 1 +static tTestDesc aHpux_Imaginary_ITests[] = { + { TT_EGREP, zHpux_Imaginary_ISelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Kandr_Concat + * Fix Command Arguments for Hpux_Imaginary_I */ -static const char* apzKandr_ConcatPatch[] = { +static const char* apzHpux_Imaginary_IPatch[] = { "format", - "##", + "#define _Complex_I (__extension__ 1.0iF)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Libc1_G_Va_List fix + * Description of Huge_Val_Hex fix */ -tSCC zLibc1_G_Va_ListName[] = - "libc1_G_va_list"; +tSCC zHuge_Val_HexName[] = + "huge_val_hex"; /* * File name selection pattern */ -tSCC zLibc1_G_Va_ListList[] = - "|_G_config.h|"; +tSCC zHuge_Val_HexList[] = + "bits/huge_val.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzLibc1_G_Va_ListMachs[] = { - "*-*-linux*libc1", - (const char*)NULL }; +#define apzHuge_Val_HexMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zLibc1_G_Va_ListSelect0[] = - "typedef void \\* _G_va_list;"; +tSCC zHuge_Val_HexSelect0[] = + "^#[ \t]*define[ \t]*HUGE_VAL[ \t].*0x1\\.0p.*"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zHuge_Val_HexBypass0[] = + "__builtin_huge_val"; -#define LIBC1_G_VA_LIST_TEST_CT 1 -static tTestDesc aLibc1_G_Va_ListTests[] = { - { TT_EGREP, zLibc1_G_Va_ListSelect0, (regex_t*)NULL }, }; +#define HUGE_VAL_HEX_TEST_CT 2 +static tTestDesc aHuge_Val_HexTests[] = { + { TT_NEGREP, zHuge_Val_HexBypass0, (regex_t*)NULL }, + { TT_EGREP, zHuge_Val_HexSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Libc1_G_Va_List + * Fix Command Arguments for Huge_Val_Hex */ -static const char* apzLibc1_G_Va_ListPatch[] = { +static const char* apzHuge_Val_HexPatch[] = { "format", - "typedef __builtin_va_list _G_va_list;", + "#define HUGE_VAL (__builtin_huge_val())\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Libc1_Ifdefd_Memx fix + * Description of Huge_Valf_Hex fix */ -tSCC zLibc1_Ifdefd_MemxName[] = - "libc1_ifdefd_memx"; +tSCC zHuge_Valf_HexName[] = + "huge_valf_hex"; /* * File name selection pattern */ -tSCC zLibc1_Ifdefd_MemxList[] = - "|testing.h|string.h|"; +tSCC zHuge_Valf_HexList[] = + "bits/huge_val.h\0"; /* * Machine/OS name selection pattern */ -#define apzLibc1_Ifdefd_MemxMachs (const char**)NULL +#define apzHuge_Valf_HexMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zLibc1_Ifdefd_MemxSelect0[] = - "' is a built-in function for gcc 2\\.x\\. \\*/"; +tSCC zHuge_Valf_HexSelect0[] = + "^#[ \t]*define[ \t]*HUGE_VALF[ \t].*0x1\\.0p.*"; /* * content bypass pattern - skip fix if pattern found */ -tSCC zLibc1_Ifdefd_MemxBypass0[] = - "__cplusplus"; +tSCC zHuge_Valf_HexBypass0[] = + "__builtin_huge_valf"; -#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 }, }; +#define HUGE_VALF_HEX_TEST_CT 2 +static tTestDesc aHuge_Valf_HexTests[] = { + { TT_NEGREP, zHuge_Valf_HexBypass0, (regex_t*)NULL }, + { TT_EGREP, zHuge_Valf_HexSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Libc1_Ifdefd_Memx + * Fix Command Arguments for Huge_Valf_Hex */ -static const char* apzLibc1_Ifdefd_MemxPatch[] = { +static const char* apzHuge_Valf_HexPatch[] = { "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", + "#define HUGE_VALF (__builtin_huge_valf())\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Linux_Ia64_Ucontext fix + * Description of Huge_Vall_Hex fix */ -tSCC zLinux_Ia64_UcontextName[] = - "linux_ia64_ucontext"; +tSCC zHuge_Vall_HexName[] = + "huge_vall_hex"; /* * File name selection pattern */ -tSCC zLinux_Ia64_UcontextList[] = - "|sys/ucontext.h|"; +tSCC zHuge_Vall_HexList[] = + "bits/huge_val.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzLinux_Ia64_UcontextMachs[] = { - "ia64-*-linux*", - (const char*)NULL }; +#define apzHuge_Vall_HexMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zLinux_Ia64_UcontextSelect0[] = - "\\(\\(\\(char \\*\\) &\\(\\(struct sigcontext \\*\\) 0\\)->sc_gr\\[0\\]\\) - \\(char \\*\\) 0\\)"; +tSCC zHuge_Vall_HexSelect0[] = + "^#[ \t]*define[ \t]*HUGE_VALL[ \t].*0x1\\.0p.*"; -#define LINUX_IA64_UCONTEXT_TEST_CT 1 -static tTestDesc aLinux_Ia64_UcontextTests[] = { - { TT_EGREP, zLinux_Ia64_UcontextSelect0, (regex_t*)NULL }, }; +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zHuge_Vall_HexBypass0[] = + "__builtin_huge_vall"; + +#define HUGE_VALL_HEX_TEST_CT 2 +static tTestDesc aHuge_Vall_HexTests[] = { + { TT_NEGREP, zHuge_Vall_HexBypass0, (regex_t*)NULL }, + { TT_EGREP, zHuge_Vall_HexSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Linux_Ia64_Ucontext + * Fix Command Arguments for Huge_Vall_Hex */ -static const char* apzLinux_Ia64_UcontextPatch[] = { +static const char* apzHuge_Vall_HexPatch[] = { "format", - "__builtin_offsetof (struct sigcontext, sc_gr[0])", + "#define HUGE_VALL (__builtin_huge_vall())\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Lynxos_No_Warning_In_Sys_Time_H fix + * Description of Int_Abort_Free_And_Exit fix */ -tSCC zLynxos_No_Warning_In_Sys_Time_HName[] = - "lynxos_no_warning_in_sys_time_h"; +tSCC zInt_Abort_Free_And_ExitName[] = + "int_abort_free_and_exit"; /* * File name selection pattern */ -tSCC zLynxos_No_Warning_In_Sys_Time_HList[] = - "|sys/time.h|"; +tSCC zInt_Abort_Free_And_ExitList[] = + "stdlib.h\0"; /* * Machine/OS name selection pattern */ -#define apzLynxos_No_Warning_In_Sys_Time_HMachs (const char**)NULL +#define apzInt_Abort_Free_And_ExitMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zLynxos_No_Warning_In_Sys_Time_HSelect0[] = - "#warning[ \t]+Using instead of "; +tSCC zInt_Abort_Free_And_ExitSelect0[] = + "int[ \t]+(abort|free|exit)[ \t]*\\("; -#define LYNXOS_NO_WARNING_IN_SYS_TIME_H_TEST_CT 1 -static tTestDesc aLynxos_No_Warning_In_Sys_Time_HTests[] = { - { TT_EGREP, zLynxos_No_Warning_In_Sys_Time_HSelect0, (regex_t*)NULL }, }; +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zInt_Abort_Free_And_ExitBypass0[] = + "_CLASSIC_ANSI_TYPES"; + +#define INT_ABORT_FREE_AND_EXIT_TEST_CT 2 +static tTestDesc aInt_Abort_Free_And_ExitTests[] = { + { TT_NEGREP, zInt_Abort_Free_And_ExitBypass0, (regex_t*)NULL }, + { TT_EGREP, zInt_Abort_Free_And_ExitSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Lynxos_No_Warning_In_Sys_Time_H + * Fix Command Arguments for Int_Abort_Free_And_Exit */ -static const char* apzLynxos_No_Warning_In_Sys_Time_HPatch[] = { +static const char* apzInt_Abort_Free_And_ExitPatch[] = { "format", - "", + "void\t%1(", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Lynxos_Missing_Putenv fix + * Description of Io_Quotes_Def fix */ -tSCC zLynxos_Missing_PutenvName[] = - "lynxos_missing_putenv"; +tSCC zIo_Quotes_DefName[] = + "io_quotes_def"; /* * File name selection pattern */ -tSCC zLynxos_Missing_PutenvList[] = - "|stdlib.h|"; +#define zIo_Quotes_DefList (char*)NULL /* * Machine/OS name selection pattern */ -tSCC* apzLynxos_Missing_PutenvMachs[] = { - "*-*-lynxos*", - (const char*)NULL }; +#define apzIo_Quotes_DefMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zLynxos_Missing_PutenvSelect0[] = - "extern char \\*getenv[ \t]*_AP\\(\\(const char \\*\\)\\);"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zLynxos_Missing_PutenvBypass0[] = - "putenv[ \\t]*\\("; +tSCC zIo_Quotes_DefSelect0[] = + "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\([a-zA-Z][,)]"; -#define LYNXOS_MISSING_PUTENV_TEST_CT 2 -static tTestDesc aLynxos_Missing_PutenvTests[] = { - { TT_NEGREP, zLynxos_Missing_PutenvBypass0, (regex_t*)NULL }, - { TT_EGREP, zLynxos_Missing_PutenvSelect0, (regex_t*)NULL }, }; +#define IO_QUOTES_DEF_TEST_CT 1 +static tTestDesc aIo_Quotes_DefTests[] = { + { TT_EGREP, zIo_Quotes_DefSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Lynxos_Missing_Putenv + * Fix Command Arguments for Io_Quotes_Def */ -static const char* apzLynxos_Missing_PutenvPatch[] = { - "format", - "%0\n\ -extern int putenv\t\t\t\t_AP((char *));", - "extern char \\*getenv[ \t]*_AP\\(\\(const char \\*\\)\\);", +static const char* apzIo_Quotes_DefPatch[] = { + "char_macro_def", + "IO", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Machine_Ansi_H_Va_List fix + * Description of Io_Quotes_Use fix */ -tSCC zMachine_Ansi_H_Va_ListName[] = - "machine_ansi_h_va_list"; +tSCC zIo_Quotes_UseName[] = + "io_quotes_use"; /* * File name selection pattern */ -#define zMachine_Ansi_H_Va_ListList (char*)NULL +#define zIo_Quotes_UseList (char*)NULL /* * Machine/OS name selection pattern */ -#define apzMachine_Ansi_H_Va_ListMachs (const char**)NULL +#define apzIo_Quotes_UseMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zMachine_Ansi_H_Va_ListSelect0[] = - "define[ \t]+_BSD_VA_LIST_[ \t]"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zMachine_Ansi_H_Va_ListBypass0[] = - "__builtin_va_list"; +tSCC zIo_Quotes_UseSelect0[] = + "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+IO[A-Z]*[ \t]*\\( *[^,']"; -#define MACHINE_ANSI_H_VA_LIST_TEST_CT 2 -static tTestDesc aMachine_Ansi_H_Va_ListTests[] = { - { TT_NEGREP, zMachine_Ansi_H_Va_ListBypass0, (regex_t*)NULL }, - { TT_EGREP, zMachine_Ansi_H_Va_ListSelect0, (regex_t*)NULL }, }; +#define IO_QUOTES_USE_TEST_CT 1 +static tTestDesc aIo_Quotes_UseTests[] = { + { TT_EGREP, zIo_Quotes_UseSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Machine_Ansi_H_Va_List + * Fix Command Arguments for Io_Quotes_Use */ -static const char* apzMachine_Ansi_H_Va_ListPatch[] = { - "format", - "%1__builtin_va_list", - "(define[ \t]+_BSD_VA_LIST_[ \t]+).*", +static const char* apzIo_Quotes_UsePatch[] = { + "char_macro_use", + "IO", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Machine_Name fix + * Description of Ip_Missing_Semi fix */ -tSCC zMachine_NameName[] = - "machine_name"; +tSCC zIp_Missing_SemiName[] = + "ip_missing_semi"; /* * File name selection pattern */ -#define zMachine_NameList (char*)NULL +tSCC zIp_Missing_SemiList[] = + "netinet/ip.h\0"; /* * Machine/OS name selection pattern */ -#define apzMachine_NameMachs (const char**)NULL +#define apzIp_Missing_SemiMachs (const char**)NULL /* - * perform the C function call test + * content selection pattern - do fix if pattern found */ -tSCC zMachine_NameFTst0[] = "machine_name"; +tSCC zIp_Missing_SemiSelect0[] = + "}$"; -#define MACHINE_NAME_TEST_CT 1 -static tTestDesc aMachine_NameTests[] = { - { TT_FUNCTION, zMachine_NameFTst0, 0 /* unused */ }, }; +#define IP_MISSING_SEMI_TEST_CT 1 +static tTestDesc aIp_Missing_SemiTests[] = { + { TT_EGREP, zIp_Missing_SemiSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Machine_Name + * Fix Command Arguments for Ip_Missing_Semi */ -static const char* apzMachine_NamePatch[] = { - "machine_name", +static const char* apzIp_Missing_SemiPatch[] = { sed_cmd_z, + "-e", "/^struct/,/^};/s/}$/};/", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Math_Exception fix + * Description of Irix___Restrict fix */ -tSCC zMath_ExceptionName[] = - "math_exception"; +tSCC zIrix___RestrictName[] = + "irix___restrict"; /* * File name selection pattern */ -tSCC zMath_ExceptionList[] = - "|math.h|"; +tSCC zIrix___RestrictList[] = + "internal/sgimacros.h\0"; /* * Machine/OS name selection pattern */ -#define apzMath_ExceptionMachs (const char**)NULL +tSCC* apzIrix___RestrictMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zMath_ExceptionSelect0[] = - "struct exception"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zMath_ExceptionBypass0[] = - "We have a problem when using C\\+\\+|for C\\+\\+, _[a-z0-9A-Z_]+_exception; for C, exception"; +tSCC zIrix___RestrictSelect0[] = + "(#ifdef __c99\n\ +)(#[ \t]*define __restrict restrict)"; -#define MATH_EXCEPTION_TEST_CT 2 -static tTestDesc aMath_ExceptionTests[] = { - { TT_NEGREP, zMath_ExceptionBypass0, (regex_t*)NULL }, - { TT_EGREP, zMath_ExceptionSelect0, (regex_t*)NULL }, }; +#define IRIX___RESTRICT_TEST_CT 1 +static tTestDesc aIrix___RestrictTests[] = { + { TT_EGREP, zIrix___RestrictSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Math_Exception + * Fix Command Arguments for Irix___Restrict */ -static const char* apzMath_ExceptionPatch[] = { - "wrap", - "#ifdef __cplusplus\n\ -#define exception __math_exception\n\ -#endif\n", - "#ifdef __cplusplus\n\ -#undef exception\n\ -#endif\n", +static const char* apzIrix___RestrictPatch[] = { + "format", + "%1# ifndef __cplusplus\n\ +%2\n\ +# endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Math_Huge_Val_From_Dbl_Max fix + * Description of Irix___Generic1 fix */ -tSCC zMath_Huge_Val_From_Dbl_MaxName[] = - "math_huge_val_from_dbl_max"; +tSCC zIrix___Generic1Name[] = + "irix___generic1"; /* * File name selection pattern */ -tSCC zMath_Huge_Val_From_Dbl_MaxList[] = - "|math.h|"; +tSCC zIrix___Generic1List[] = + "internal/math_core.h\0"; /* * Machine/OS name selection pattern */ -#define apzMath_Huge_Val_From_Dbl_MaxMachs (const char**)NULL +tSCC* apzIrix___Generic1Machs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zMath_Huge_Val_From_Dbl_MaxSelect0[] = - "define[ \t]+HUGE_VAL[ \t]+DBL_MAX"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zMath_Huge_Val_From_Dbl_MaxBypass0[] = - "define[ \t]+DBL_MAX"; +tSCC zIrix___Generic1Select0[] = + "#define ([a-z]+)\\(x\\) *__generic.*"; -#define MATH_HUGE_VAL_FROM_DBL_MAX_TEST_CT 2 -static tTestDesc aMath_Huge_Val_From_Dbl_MaxTests[] = { - { TT_NEGREP, zMath_Huge_Val_From_Dbl_MaxBypass0, (regex_t*)NULL }, - { TT_EGREP, zMath_Huge_Val_From_Dbl_MaxSelect0, (regex_t*)NULL }, }; +#define IRIX___GENERIC1_TEST_CT 1 +static tTestDesc aIrix___Generic1Tests[] = { + { TT_EGREP, zIrix___Generic1Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Math_Huge_Val_From_Dbl_Max + * Fix Command Arguments for Irix___Generic1 */ -static const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c", - "\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h | sed 's/.*DBL_MAX[ \t]*//' 2>/dev/null`\n\n\ -\tif ( test -n \"${dbl_max_def}\" ) > /dev/null 2>&1\n\ -\tthen sed -e '/define[ \t]*HUGE_VAL[ \t]*DBL_MAX/s@DBL_MAX@'\"$dbl_max_def@\"\n\ -\telse cat\n\ -\tfi", +static const char* apzIrix___Generic1Patch[] = { + "format", + "extern int %1(double);\n\ +extern int %1f(float);\n\ +extern int %1l(long double);\n\ +#define %1(x) (sizeof(x) == sizeof(double) ? _%1(x) \\\n\ + : sizeof(x) == sizeof(float) ? _%1f(x) \\\n\ + : _%1l(x))\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Nested_Auth_Des fix + * Description of Irix___Generic2 fix */ -tSCC zNested_Auth_DesName[] = - "nested_auth_des"; +tSCC zIrix___Generic2Name[] = + "irix___generic2"; /* * File name selection pattern */ -tSCC zNested_Auth_DesList[] = - "|rpc/rpc.h|"; +tSCC zIrix___Generic2List[] = + "internal/math_core.h\0"; /* * Machine/OS name selection pattern */ -#define apzNested_Auth_DesMachs (const char**)NULL +tSCC* apzIrix___Generic2Machs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zNested_Auth_DesSelect0[] = - "(/\\*.*rpc/auth_des\\.h>.*)/\\*"; +tSCC zIrix___Generic2Select0[] = + "#define ([a-z]+)\\(x,y\\) *__generic.*"; -#define NESTED_AUTH_DES_TEST_CT 1 -static tTestDesc aNested_Auth_DesTests[] = { - { TT_EGREP, zNested_Auth_DesSelect0, (regex_t*)NULL }, }; +#define IRIX___GENERIC2_TEST_CT 1 +static tTestDesc aIrix___Generic2Tests[] = { + { TT_EGREP, zIrix___Generic2Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Nested_Auth_Des + * Fix Command Arguments for Irix___Generic2 */ -static const char* apzNested_Auth_DesPatch[] = { +static const char* apzIrix___Generic2Patch[] = { "format", - "%1*/ /*", + "#define %1(x,y) \\\n\ + ((sizeof(x)<=4 && sizeof(y)<=4) ? _%1f(x,y) \\\n\ + : (sizeof(x)<=8 && sizeof(y)<=8) ? _%1(x,y) \\\n\ + : _%1l(x,y))\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Nested_Motorola fix + * Description of Irix_Asm_Apostrophe fix */ -tSCC zNested_MotorolaName[] = - "nested_motorola"; +tSCC zIrix_Asm_ApostropheName[] = + "irix_asm_apostrophe"; /* * File name selection pattern */ -tSCC zNested_MotorolaList[] = - "|sys/limits.h|limits.h|"; +tSCC zIrix_Asm_ApostropheList[] = + "sys/asm.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzNested_MotorolaMachs[] = { - "m68k-motorola-sysv*", - (const char*)NULL }; +#define apzIrix_Asm_ApostropheMachs (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 zIrix_Asm_ApostropheSelect0[] = + "^[ \t]*#.*[Ww]e're"; -#define NESTED_MOTOROLA_TEST_CT 1 -static tTestDesc aNested_MotorolaTests[] = { - { TT_EGREP, zNested_MotorolaSelect0, (regex_t*)NULL }, }; +#define IRIX_ASM_APOSTROPHE_TEST_CT 1 +static tTestDesc aIrix_Asm_ApostropheTests[] = { + { TT_EGREP, zIrix_Asm_ApostropheSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Nested_Motorola + * Fix Command Arguments for Irix_Asm_Apostrophe */ -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* apzIrix_Asm_ApostrophePatch[] = { + "format", + "%1 are", + "^([ \t]*#.*[Ww]e)'re", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Nested_Sys_Limits fix + * Description of Irix_Complex fix */ -tSCC zNested_Sys_LimitsName[] = - "nested_sys_limits"; +tSCC zIrix_ComplexName[] = + "irix_complex"; /* * File name selection pattern */ -tSCC zNested_Sys_LimitsList[] = - "|sys/limits.h|"; +tSCC zIrix_ComplexList[] = + "complex.h\0"; /* * Machine/OS name selection pattern */ -#define apzNested_Sys_LimitsMachs (const char**)NULL +tSCC* apzIrix_ComplexMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zNested_Sys_LimitsSelect0[] = - "CHILD_MAX"; +tSCC zIrix_ComplexSelect0[] = + "#define[ \t]_Complex_I[ \t]\\(\\(float[ \t]_Complex\\)[ \t]\\(__I__\\)\\)"; -#define NESTED_SYS_LIMITS_TEST_CT 1 -static tTestDesc aNested_Sys_LimitsTests[] = { - { TT_EGREP, zNested_Sys_LimitsSelect0, (regex_t*)NULL }, }; +#define IRIX_COMPLEX_TEST_CT 1 +static tTestDesc aIrix_ComplexTests[] = { + { TT_EGREP, zIrix_ComplexSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Nested_Sys_Limits + * Fix Command Arguments for Irix_Complex */ -static const char* apzNested_Sys_LimitsPatch[] = { "sed", - "-e", "/CHILD_MAX/s,/\\* Max, Max,", - "-e", "/OPEN_MAX/s,/\\* Max, Max,", +static const char* apzIrix_ComplexPatch[] = { sed_cmd_z, + "-e", "s/#define[ \t]_Complex_I[ \t]((float[ \t]_Complex)[ \t](__I__))/#define _Complex_I (__extension__ 1.0iF)/", + "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d", + "-e", "/#define[ \t]_Imaginary_I/d", + "-e", "s/#define[ \t]I[ \t]_Imaginary_I/#define I _Complex_I/", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Netbsd_Extra_Semicolon fix + * Description of Irix_Limits_Const fix */ -tSCC zNetbsd_Extra_SemicolonName[] = - "netbsd_extra_semicolon"; +tSCC zIrix_Limits_ConstName[] = + "irix_limits_const"; /* * File name selection pattern */ -tSCC zNetbsd_Extra_SemicolonList[] = - "|sys/cdefs.h|"; +tSCC zIrix_Limits_ConstList[] = + "fixinc-test-limits.h\0limits.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzNetbsd_Extra_SemicolonMachs[] = { - "*-*-netbsd*", - (const char*)NULL }; +#define apzIrix_Limits_ConstMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zNetbsd_Extra_SemicolonSelect0[] = - "#define[ \t]*__END_DECLS[ \t]*};"; +tSCC zIrix_Limits_ConstSelect0[] = + "^extern const "; -#define NETBSD_EXTRA_SEMICOLON_TEST_CT 1 -static tTestDesc aNetbsd_Extra_SemicolonTests[] = { - { TT_EGREP, zNetbsd_Extra_SemicolonSelect0, (regex_t*)NULL }, }; +#define IRIX_LIMITS_CONST_TEST_CT 1 +static tTestDesc aIrix_Limits_ConstTests[] = { + { TT_EGREP, zIrix_Limits_ConstSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Netbsd_Extra_Semicolon + * Fix Command Arguments for Irix_Limits_Const */ -static const char* apzNetbsd_Extra_SemicolonPatch[] = { +static const char* apzIrix_Limits_ConstPatch[] = { "format", - "#define __END_DECLS }", + "extern __const ", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Next_Math_Prefix fix + * Description of Irix_Socklen_T fix */ -tSCC zNext_Math_PrefixName[] = - "next_math_prefix"; +tSCC zIrix_Socklen_TName[] = + "irix_socklen_t"; /* * File name selection pattern */ -tSCC zNext_Math_PrefixList[] = - "|ansi/math.h|"; +tSCC zIrix_Socklen_TList[] = + "sys/socket.h\0"; /* * Machine/OS name selection pattern */ -#define apzNext_Math_PrefixMachs (const char**)NULL +tSCC* apzIrix_Socklen_TMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zNext_Math_PrefixSelect0[] = - "^extern[ \t]+double[ \t]+__const__[ \t]"; +tSCC zIrix_Socklen_TSelect0[] = + "(#define _SOCKLEN_T\n\ +)(typedef u_int32_t socklen_t;)"; -#define NEXT_MATH_PREFIX_TEST_CT 1 -static tTestDesc aNext_Math_PrefixTests[] = { - { TT_EGREP, zNext_Math_PrefixSelect0, (regex_t*)NULL }, }; +#define IRIX_SOCKLEN_T_TEST_CT 1 +static tTestDesc aIrix_Socklen_TTests[] = { + { TT_EGREP, zIrix_Socklen_TSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Next_Math_Prefix + * Fix Command Arguments for Irix_Socklen_T */ -static const char* apzNext_Math_PrefixPatch[] = { +static const char* apzIrix_Socklen_TPatch[] = { "format", - "extern double %1(", - "^extern[ \t]+double[ \t]+__const__[ \t]+([a-z]+)\\(", + "%1#if _NO_XOPEN4 && _NO_XOPEN5\n\ +typedef int socklen_t;\n\ +#else\n\ +%2\n\ +#endif /* _NO_XOPEN4 && _NO_XOPEN5 */", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Next_Template fix + * Description of Irix_Stdint_C99_Mode fix */ -tSCC zNext_TemplateName[] = - "next_template"; +tSCC zIrix_Stdint_C99_ModeName[] = + "irix_stdint_c99_mode"; /* * File name selection pattern */ -tSCC zNext_TemplateList[] = - "|bsd/libc.h|"; +tSCC zIrix_Stdint_C99_ModeList[] = + "stdint.h\0"; /* * Machine/OS name selection pattern */ -#define apzNext_TemplateMachs (const char**)NULL +tSCC* apzIrix_Stdint_C99_ModeMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zNext_TemplateSelect0[] = - "[ \t]template\\)"; +tSCC zIrix_Stdint_C99_ModeSelect0[] = + "(#ifndef __c99\n\ +)(#error This header file is to be used only for c99 mode compilations)"; -#define NEXT_TEMPLATE_TEST_CT 1 -static tTestDesc aNext_TemplateTests[] = { - { TT_EGREP, zNext_TemplateSelect0, (regex_t*)NULL }, }; +#define IRIX_STDINT_C99_MODE_TEST_CT 1 +static tTestDesc aIrix_Stdint_C99_ModeTests[] = { + { TT_EGREP, zIrix_Stdint_C99_ModeSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Next_Template + * Fix Command Arguments for Irix_Stdint_C99_Mode */ -static const char* apzNext_TemplatePatch[] = { +static const char* apzIrix_Stdint_C99_ModePatch[] = { "format", - "(%1)", - "\\(([^)]*)[ \t]template\\)", + "#if 0\n\ +%2", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Next_Volitile fix + * Description of Irix_Stdint_C99_Types fix */ -tSCC zNext_VolitileName[] = - "next_volitile"; +tSCC zIrix_Stdint_C99_TypesName[] = + "irix_stdint_c99_types"; /* * File name selection pattern */ -tSCC zNext_VolitileList[] = - "|ansi/stdlib.h|"; +tSCC zIrix_Stdint_C99_TypesList[] = + "stdint-irix65.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -#define apzNext_VolitileMachs (const char**)NULL +tSCC* apzIrix_Stdint_C99_TypesMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; +#define IRIX_STDINT_C99_TYPES_TEST_CT 0 +#define aIrix_Stdint_C99_TypesTests (tTestDesc*)NULL /* - * content selection pattern - do fix if pattern found + * Fix Command Arguments for Irix_Stdint_C99_Types */ -tSCC zNext_VolitileSelect0[] = - "^extern[ \t]+volatile[ \t]+void[ \t]"; +static const char* apzIrix_Stdint_C99_TypesPatch[] = { sed_cmd_z, + "-e", "s@^#define INT64_MIN.*(-0x7fffffffffffffff - 1)$@#define INT64_MIN (-0x7fffffffffffffffLL - 1)@", + "-e", "s@^#define INT64_MAX.*0x7fffffffffffffff$@#define INT64_MAX 0x7fffffffffffffffLL@", + "-e", "s@^#define UINT32_MAX.*0xffffffff$@#define UINT32_MAX 0xffffffffU@", + "-e", "s@^#define UINT64_MAX.*0xffffffffffffffff$@#define UINT64_MAX 0xffffffffffffffffULL@", + "-e", "s@^#define INTPTR_MIN.*INT32_MIN$@#define INTPTR_MIN (-0x7fffffffL - 1)@", + "-e", "s@^#define INTPTR_MAX.*INT32_MAX$@#define INTPTR_MAX 0x7fffffffL@", + "-e", "s@^#define UINTPTR_MAX.*UINT32_MAX$@#define UINTPTR_MAX 0xffffffffUL@", + "-e", "s@^#define INTPTR_MIN.*INT64_MIN@#define INTPTR_MIN (-0x7fffffffffffffffL - 1)@", + "-e", "s@^#define INTPTR_MAX.*INT64_MAX$@#define INTPTR_MAX 0x7fffffffffffffffL@", + "-e", "s@^#define UINTPTR_MAX.*UINT64_MAX$@#define UINTPTR_MAX 0xffffffffffffffffUL@", + "-e", "s@^#define PTRDIFF_MIN.*INT64_MIN$@#define PTRDIFF_MIN (-0x7fffffffffffffffL - 1)@", + "-e", "s@^#define PTRDIFF_MAX.*INT64_MAX$@#define PTRDIFF_MAX 0x7fffffffffffffffL@", + "-e", "s@^#define SIZE_MAX.*UINT64_MAX$@#define SIZE_MAX 0xffffffffffffffffUL@", + (char*)NULL }; -#define NEXT_VOLITILE_TEST_CT 1 -static tTestDesc aNext_VolitileTests[] = { - { TT_EGREP, zNext_VolitileSelect0, (regex_t*)NULL }, }; +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Irix_Stdint_C99_Macros fix + */ +tSCC zIrix_Stdint_C99_MacrosName[] = + "irix_stdint_c99_macros"; /* - * Fix Command Arguments for Next_Volitile + * File name selection pattern */ -static const char* apzNext_VolitilePatch[] = { - "format", - "extern void %1(", - "^extern[ \t]+volatile[ \t]+void[ \t]+(exit|abort)\\(", +tSCC zIrix_Stdint_C99_MacrosList[] = + "stdint-irix65.h\0stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzIrix_Stdint_C99_MacrosMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; +#define IRIX_STDINT_C99_MACROS_TEST_CT 0 +#define aIrix_Stdint_C99_MacrosTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Irix_Stdint_C99_Macros + */ +static const char* apzIrix_Stdint_C99_MacrosPatch[] = { sed_cmd_z, + "-e", "s@^#define INT8_C(x).*int.*_t.*$@#define INT8_C(x) (x)@", + "-e", "s@^#define INT16_C(x).*int.*_t.*$@#define INT16_C(x) (x)@", + "-e", "s@^#define INT32_C(x).*int.*_t.*$@#define INT32_C(x) (x)@", + "-e", "s@^#define INT64_C(x).*int.*_t.*$@#define INT64_C(x) (x ## LL)@", + "-e", "s@^#define UINT8_C(x).*int.*_t.*$@#define UINT8_C(x) (x)@", + "-e", "s@^#define UINT16_C(x).*int.*_t.*$@#define UINT16_C(x) (x)@", + "-e", "s@^#define UINT32_C(x).*int.*_t.*$@#define UINT32_C(x) (x ## U)@", + "-e", "s@^#define UINT64_C(x).*int.*_t.*$@#define UINT64_C(x) (x ## ULL)@", + "-e", "s@^#define INTMAX_C(x).*int.*_t.*$@#define INTMAX_C(x) (x ## LL)@", + "-e", "s@^#define UINTMAX_C(x).*int.*_t.*$@#define UINTMAX_C(x) (x ## ULL)@", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Next_Wait_Union fix + * Description of Irix_Stdio_Va_List fix */ -tSCC zNext_Wait_UnionName[] = - "next_wait_union"; +tSCC zIrix_Stdio_Va_ListName[] = + "irix_stdio_va_list"; /* * File name selection pattern */ -tSCC zNext_Wait_UnionList[] = - "|sys/wait.h|"; +tSCC zIrix_Stdio_Va_ListList[] = + "stdio.h\0internal/stdio_core.h\0"; /* * Machine/OS name selection pattern */ -#define apzNext_Wait_UnionMachs (const char**)NULL +#define apzIrix_Stdio_Va_ListMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zNext_Wait_UnionSelect0[] = - "wait\\(union wait"; +tSCC zIrix_Stdio_Va_ListSelect0[] = + "/\\* va_list \\*/ char \\*"; -#define NEXT_WAIT_UNION_TEST_CT 1 -static tTestDesc aNext_Wait_UnionTests[] = { - { TT_EGREP, zNext_Wait_UnionSelect0, (regex_t*)NULL }, }; +#define IRIX_STDIO_VA_LIST_TEST_CT 1 +static tTestDesc aIrix_Stdio_Va_ListTests[] = { + { TT_EGREP, zIrix_Stdio_Va_ListSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Next_Wait_Union + * Fix Command Arguments for Irix_Stdio_Va_List */ -static const char* apzNext_Wait_UnionPatch[] = { +static const char* apzIrix_Stdio_Va_ListPatch[] = { "format", - "wait(void", + "__gnuc_va_list", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Nodeent_Syntax fix + * Description of Irix_Wcsftime fix */ -tSCC zNodeent_SyntaxName[] = - "nodeent_syntax"; +tSCC zIrix_WcsftimeName[] = + "irix_wcsftime"; /* * File name selection pattern */ -tSCC zNodeent_SyntaxList[] = - "|netdnet/dnetdb.h|"; +tSCC zIrix_WcsftimeList[] = + "internal/wchar_core.h\0"; /* * Machine/OS name selection pattern */ -#define apzNodeent_SyntaxMachs (const char**)NULL +tSCC* apzIrix_WcsftimeMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zNodeent_SyntaxSelect0[] = - "char[ \t]*\\*na_addr[ \t]*$"; +tSCC zIrix_WcsftimeSelect0[] = + "#if _NO_XOPEN5\n\ +(extern size_t[ \t]+wcsftime.*const char *.*)"; -#define NODEENT_SYNTAX_TEST_CT 1 -static tTestDesc aNodeent_SyntaxTests[] = { - { TT_EGREP, zNodeent_SyntaxSelect0, (regex_t*)NULL }, }; +#define IRIX_WCSFTIME_TEST_CT 1 +static tTestDesc aIrix_WcsftimeTests[] = { + { TT_EGREP, zIrix_WcsftimeSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Nodeent_Syntax + * Fix Command Arguments for Irix_Wcsftime */ -static const char* apzNodeent_SyntaxPatch[] = { +static const char* apzIrix_WcsftimePatch[] = { "format", - "%0;", + "#if _NO_XOPEN5 && !defined(__c99)\n\ +%1", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Obstack_Lvalue_Cast fix + * Description of Kandr_Concat fix */ -tSCC zObstack_Lvalue_CastName[] = - "obstack_lvalue_cast"; +tSCC zKandr_ConcatName[] = + "kandr_concat"; /* * File name selection pattern */ -tSCC zObstack_Lvalue_CastList[] = - "|obstack.h|"; +tSCC zKandr_ConcatList[] = + "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 */ -#define apzObstack_Lvalue_CastMachs (const char**)NULL +#define apzKandr_ConcatMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zObstack_Lvalue_CastSelect0[] = - "\\*\\(\\(([^()]*)\\*\\)(.*)\\)\\+\\+ = \\(([^()]*)\\)"; +tSCC zKandr_ConcatSelect0[] = + "/\\*\\*/"; -#define OBSTACK_LVALUE_CAST_TEST_CT 1 -static tTestDesc aObstack_Lvalue_CastTests[] = { - { TT_EGREP, zObstack_Lvalue_CastSelect0, (regex_t*)NULL }, }; +#define KANDR_CONCAT_TEST_CT 1 +static tTestDesc aKandr_ConcatTests[] = { + { TT_EGREP, zKandr_ConcatSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Obstack_Lvalue_Cast + * Fix Command Arguments for Kandr_Concat */ -static const char* apzObstack_Lvalue_CastPatch[] = { +static const char* apzKandr_ConcatPatch[] = { "format", - "((*((%1*)%2) = (%3)), (%2 += sizeof (%1)))", + "##", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Osf_Namespace_A fix + * Description of Linux_Ia64_Ucontext fix */ -tSCC zOsf_Namespace_AName[] = - "osf_namespace_a"; +tSCC zLinux_Ia64_UcontextName[] = + "linux_ia64_ucontext"; /* * File name selection pattern */ -tSCC zOsf_Namespace_AList[] = - "|reg_types.h|sys/lc_core.h|"; +tSCC zLinux_Ia64_UcontextList[] = + "sys/ucontext.h\0"; /* * Machine/OS name selection pattern */ -#define apzOsf_Namespace_AMachs (const char**)NULL +tSCC* apzLinux_Ia64_UcontextMachs[] = { + "ia64-*-linux*", + (const char*)NULL }; /* - * perform the 'test' shell command - do fix on success + * content selection pattern - do fix if pattern found */ -tSCC zOsf_Namespace_ATest0[] = - " -r reg_types.h"; -tSCC zOsf_Namespace_ATest1[] = - " -r sys/lc_core.h"; -tSCC zOsf_Namespace_ATest2[] = - " -n \"`grep '} regex_t;' reg_types.h`\""; -tSCC zOsf_Namespace_ATest3[] = - " -z \"`grep __regex_t regex.h`\""; +tSCC zLinux_Ia64_UcontextSelect0[] = + "\\(\\(\\(char \\*\\) &\\(\\(struct sigcontext \\*\\) 0\\)->sc_gr\\[0\\]\\) - \\(char \\*\\) 0\\)"; -#define OSF_NAMESPACE_A_TEST_CT 4 -static tTestDesc aOsf_Namespace_ATests[] = { - { TT_TEST, zOsf_Namespace_ATest0, 0 /* unused */ }, - { TT_TEST, zOsf_Namespace_ATest1, 0 /* unused */ }, - { TT_TEST, zOsf_Namespace_ATest2, 0 /* unused */ }, - { TT_TEST, zOsf_Namespace_ATest3, 0 /* unused */ }, }; +#define LINUX_IA64_UCONTEXT_TEST_CT 1 +static tTestDesc aLinux_Ia64_UcontextTests[] = { + { TT_EGREP, zLinux_Ia64_UcontextSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Osf_Namespace_A + * Fix Command Arguments for Linux_Ia64_Ucontext */ -static const char* apzOsf_Namespace_APatch[] = { +static const char* apzLinux_Ia64_UcontextPatch[] = { "format", - "__%0", - "reg(ex|off|match)_t", + "__builtin_offsetof (struct sigcontext, sc_gr[0])", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Osf_Namespace_C fix + * Description of Lynxos_No_Warning_In_Sys_Time_H fix */ -tSCC zOsf_Namespace_CName[] = - "osf_namespace_c"; +tSCC zLynxos_No_Warning_In_Sys_Time_HName[] = + "lynxos_no_warning_in_sys_time_h"; /* * File name selection pattern */ -tSCC zOsf_Namespace_CList[] = - "|regex.h|"; +tSCC zLynxos_No_Warning_In_Sys_Time_HList[] = + "sys/time.h\0"; /* * Machine/OS name selection pattern */ -#define apzOsf_Namespace_CMachs (const char**)NULL +#define apzLynxos_No_Warning_In_Sys_Time_HMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zOsf_Namespace_CSelect0[] = - "#include .*"; - -/* - * perform the 'test' shell command - do fix on success - */ -tSCC zOsf_Namespace_CTest0[] = - " -r reg_types.h"; -tSCC zOsf_Namespace_CTest1[] = - " -r sys/lc_core.h"; -tSCC zOsf_Namespace_CTest2[] = - " -n \"`grep '} regex_t;' reg_types.h`\""; -tSCC zOsf_Namespace_CTest3[] = - " -z \"`grep __regex_t regex.h`\""; +tSCC zLynxos_No_Warning_In_Sys_Time_HSelect0[] = + "#warning[ \t]+Using instead of "; -#define OSF_NAMESPACE_C_TEST_CT 5 -static tTestDesc aOsf_Namespace_CTests[] = { - { TT_TEST, zOsf_Namespace_CTest0, 0 /* unused */ }, - { TT_TEST, zOsf_Namespace_CTest1, 0 /* unused */ }, - { TT_TEST, zOsf_Namespace_CTest2, 0 /* unused */ }, - { TT_TEST, zOsf_Namespace_CTest3, 0 /* unused */ }, - { TT_EGREP, zOsf_Namespace_CSelect0, (regex_t*)NULL }, }; +#define LYNXOS_NO_WARNING_IN_SYS_TIME_H_TEST_CT 1 +static tTestDesc aLynxos_No_Warning_In_Sys_Time_HTests[] = { + { TT_EGREP, zLynxos_No_Warning_In_Sys_Time_HSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Osf_Namespace_C + * Fix Command Arguments for Lynxos_No_Warning_In_Sys_Time_H */ -static const char* apzOsf_Namespace_CPatch[] = { +static const char* apzLynxos_No_Warning_In_Sys_Time_HPatch[] = { "format", - "%0\n\ -typedef __regex_t\tregex_t;\n\ -typedef __regoff_t\tregoff_t;\n\ -typedef __regmatch_t\tregmatch_t;", + "", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Pthread_Page_Size fix + * Description of Lynxos_Missing_Putenv fix */ -tSCC zPthread_Page_SizeName[] = - "pthread_page_size"; +tSCC zLynxos_Missing_PutenvName[] = + "lynxos_missing_putenv"; /* * File name selection pattern */ -tSCC zPthread_Page_SizeList[] = - "|pthread.h|"; +tSCC zLynxos_Missing_PutenvList[] = + "stdlib.h\0"; /* * Machine/OS name selection pattern */ -#define apzPthread_Page_SizeMachs (const char**)NULL +tSCC* apzLynxos_Missing_PutenvMachs[] = { + "*-*-lynxos*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zPthread_Page_SizeSelect0[] = - "^int __page_size"; +tSCC zLynxos_Missing_PutenvSelect0[] = + "extern char \\*getenv[ \t]*_AP\\(\\(const char \\*\\)\\);"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zLynxos_Missing_PutenvBypass0[] = + "putenv[ \\t]*\\("; -#define PTHREAD_PAGE_SIZE_TEST_CT 1 -static tTestDesc aPthread_Page_SizeTests[] = { - { TT_EGREP, zPthread_Page_SizeSelect0, (regex_t*)NULL }, }; +#define LYNXOS_MISSING_PUTENV_TEST_CT 2 +static tTestDesc aLynxos_Missing_PutenvTests[] = { + { TT_NEGREP, zLynxos_Missing_PutenvBypass0, (regex_t*)NULL }, + { TT_EGREP, zLynxos_Missing_PutenvSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Pthread_Page_Size + * Fix Command Arguments for Lynxos_Missing_Putenv */ -static const char* apzPthread_Page_SizePatch[] = { +static const char* apzLynxos_Missing_PutenvPatch[] = { "format", - "extern %0", + "%0\n\ +extern int putenv\t\t\t\t_AP((char *));", + "extern char \\*getenv[ \t]*_AP\\(\\(const char \\*\\)\\);", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Pthread_Incomplete_Struct_Argument fix + * Description of Machine_Ansi_H_Va_List fix */ -tSCC zPthread_Incomplete_Struct_ArgumentName[] = - "pthread_incomplete_struct_argument"; +tSCC zMachine_Ansi_H_Va_ListName[] = + "machine_ansi_h_va_list"; /* * File name selection pattern */ -tSCC zPthread_Incomplete_Struct_ArgumentList[] = - "|pthread.h|"; +#define zMachine_Ansi_H_Va_ListList (char*)NULL /* * Machine/OS name selection pattern */ -#define apzPthread_Incomplete_Struct_ArgumentMachs (const char**)NULL +#define apzMachine_Ansi_H_Va_ListMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zMachine_Ansi_H_Va_ListSelect0[] = + "define[ \t]+_BSD_VA_LIST_[ \t]"; /* - * content selection pattern - do fix if pattern found + * content bypass pattern - skip fix if pattern found */ -tSCC zPthread_Incomplete_Struct_ArgumentSelect0[] = - "struct __jmp_buf_tag"; +tSCC zMachine_Ansi_H_Va_ListBypass0[] = + "__builtin_va_list"; -#define PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT 1 -static tTestDesc aPthread_Incomplete_Struct_ArgumentTests[] = { - { TT_EGREP, zPthread_Incomplete_Struct_ArgumentSelect0, (regex_t*)NULL }, }; +#define MACHINE_ANSI_H_VA_LIST_TEST_CT 2 +static tTestDesc aMachine_Ansi_H_Va_ListTests[] = { + { TT_NEGREP, zMachine_Ansi_H_Va_ListBypass0, (regex_t*)NULL }, + { TT_EGREP, zMachine_Ansi_H_Va_ListSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Pthread_Incomplete_Struct_Argument + * Fix Command Arguments for Machine_Ansi_H_Va_List */ -static const char* apzPthread_Incomplete_Struct_ArgumentPatch[] = { +static const char* apzMachine_Ansi_H_Va_ListPatch[] = { "format", - "%1 *%2%3", - "^(extern int __sigsetjmp \\(struct __jmp_buf_tag) (__env)\\[1\\](.*)$", + "%1__builtin_va_list", + "(define[ \t]+_BSD_VA_LIST_[ \t]+).*", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Read_Ret_Type fix + * Description of Machine_Name fix */ -tSCC zRead_Ret_TypeName[] = - "read_ret_type"; +tSCC zMachine_NameName[] = + "machine_name"; /* * File name selection pattern */ -tSCC zRead_Ret_TypeList[] = - "|stdio.h|"; +#define zMachine_NameList (char*)NULL /* * Machine/OS name selection pattern */ -#define apzRead_Ret_TypeMachs (const char**)NULL +#define apzMachine_NameMachs (const char**)NULL /* - * content selection pattern - do fix if pattern found + * perform the C function call test */ -tSCC zRead_Ret_TypeSelect0[] = - "extern int\t.*, fread\\(\\), fwrite\\(\\)"; +tSCC zMachine_NameFTst0[] = "machine_name"; -#define READ_RET_TYPE_TEST_CT 1 -static tTestDesc aRead_Ret_TypeTests[] = { - { TT_EGREP, zRead_Ret_TypeSelect0, (regex_t*)NULL }, }; +#define MACHINE_NAME_TEST_CT 1 +static tTestDesc aMachine_NameTests[] = { + { TT_FUNCTION, zMachine_NameFTst0, 0 /* unused */ }, }; /* - * Fix Command Arguments for Read_Ret_Type + * Fix Command Arguments for Machine_Name */ -static const char* apzRead_Ret_TypePatch[] = { - "format", - "extern unsigned int fread(), fwrite();\n\ -%1%2", - "(extern int\t.*), fread\\(\\), fwrite\\(\\)(.*)", +static const char* apzMachine_NamePatch[] = { + "machine_name", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Rpc_Xdr_Lvalue_Cast_A fix + * Description of Math_Exception fix */ -tSCC zRpc_Xdr_Lvalue_Cast_AName[] = - "rpc_xdr_lvalue_cast_a"; +tSCC zMath_ExceptionName[] = + "math_exception"; /* * File name selection pattern */ -tSCC zRpc_Xdr_Lvalue_Cast_AList[] = - "|rpc/xdr.h|"; +tSCC zMath_ExceptionList[] = + "math.h\0"; /* * Machine/OS name selection pattern */ -#define apzRpc_Xdr_Lvalue_Cast_AMachs (const char**)NULL +#define apzMath_ExceptionMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zRpc_Xdr_Lvalue_Cast_ASelect0[] = - "#define[ \t]*IXDR_GET_LONG.*\\\\\n\ -.*__extension__.*"; +tSCC zMath_ExceptionSelect0[] = + "struct exception"; -#define RPC_XDR_LVALUE_CAST_A_TEST_CT 1 -static tTestDesc aRpc_Xdr_Lvalue_Cast_ATests[] = { - { TT_EGREP, zRpc_Xdr_Lvalue_Cast_ASelect0, (regex_t*)NULL }, }; +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zMath_ExceptionBypass0[] = + "We have a problem when using C\\+\\+|for C\\+\\+, _[a-z0-9A-Z_]+_exception; for C, exception"; + +#define MATH_EXCEPTION_TEST_CT 2 +static tTestDesc aMath_ExceptionTests[] = { + { TT_NEGREP, zMath_ExceptionBypass0, (regex_t*)NULL }, + { TT_EGREP, zMath_ExceptionSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Rpc_Xdr_Lvalue_Cast_A + * Fix Command Arguments for Math_Exception */ -static const char* apzRpc_Xdr_Lvalue_Cast_APatch[] = { - "format", - "#define IXDR_GET_LONG(buf) ((long)IXDR_GET_U_INT32(buf))", +static const char* apzMath_ExceptionPatch[] = { + "wrap", + "#ifdef __cplusplus\n\ +#define exception __math_exception\n\ +#endif\n", + "#ifdef __cplusplus\n\ +#undef exception\n\ +#endif\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Rpc_Xdr_Lvalue_Cast_B fix + * Description of Math_Huge_Val_From_Dbl_Max fix */ -tSCC zRpc_Xdr_Lvalue_Cast_BName[] = - "rpc_xdr_lvalue_cast_b"; +tSCC zMath_Huge_Val_From_Dbl_MaxName[] = + "math_huge_val_from_dbl_max"; /* * File name selection pattern */ -tSCC zRpc_Xdr_Lvalue_Cast_BList[] = - "|rpc/xdr.h|"; +tSCC zMath_Huge_Val_From_Dbl_MaxList[] = + "math.h\0"; /* * Machine/OS name selection pattern */ -#define apzRpc_Xdr_Lvalue_Cast_BMachs (const char**)NULL +#define apzMath_Huge_Val_From_Dbl_MaxMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zRpc_Xdr_Lvalue_Cast_BSelect0[] = - "#define[ \t]*IXDR_PUT_LONG.*\\\\\n\ -.*__extension__.*"; +tSCC zMath_Huge_Val_From_Dbl_MaxSelect0[] = + "define[ \t]+HUGE_VAL[ \t]+DBL_MAX"; -#define RPC_XDR_LVALUE_CAST_B_TEST_CT 1 -static tTestDesc aRpc_Xdr_Lvalue_Cast_BTests[] = { - { TT_EGREP, zRpc_Xdr_Lvalue_Cast_BSelect0, (regex_t*)NULL }, }; +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zMath_Huge_Val_From_Dbl_MaxBypass0[] = + "define[ \t]+DBL_MAX"; + +#define MATH_HUGE_VAL_FROM_DBL_MAX_TEST_CT 2 +static tTestDesc aMath_Huge_Val_From_Dbl_MaxTests[] = { + { TT_NEGREP, zMath_Huge_Val_From_Dbl_MaxBypass0, (regex_t*)NULL }, + { TT_EGREP, zMath_Huge_Val_From_Dbl_MaxSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Rpc_Xdr_Lvalue_Cast_B + * Fix Command Arguments for Math_Huge_Val_From_Dbl_Max */ -static const char* apzRpc_Xdr_Lvalue_Cast_BPatch[] = { - "format", - "#define IXDR_PUT_LONG(buf, v) ((long)IXDR_PUT_INT32(buf, (long)(v)))", +static const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c", + "\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h | sed 's/.*DBL_MAX[ \t]*//' 2>/dev/null`\n\n\ +\tif ( test -n \"${dbl_max_def}\" ) > /dev/null 2>&1\n\ +\tthen sed -e '/define[ \t]*HUGE_VAL[ \t]*DBL_MAX/s@DBL_MAX@'\"$dbl_max_def@\"\n\ +\telse cat\n\ +\tfi", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Rs6000_Double fix + * Description of Nested_Auth_Des fix */ -tSCC zRs6000_DoubleName[] = - "rs6000_double"; +tSCC zNested_Auth_DesName[] = + "nested_auth_des"; /* * File name selection pattern */ -tSCC zRs6000_DoubleList[] = - "|math.h|"; +tSCC zNested_Auth_DesList[] = + "rpc/rpc.h\0"; /* * Machine/OS name selection pattern */ -#define apzRs6000_DoubleMachs (const char**)NULL +#define apzNested_Auth_DesMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zRs6000_DoubleSelect0[] = - "[^a-zA-Z_]class\\("; +tSCC zNested_Auth_DesSelect0[] = + "(/\\*.*rpc/auth_des\\.h>.*)/\\*"; -#define RS6000_DOUBLE_TEST_CT 1 -static tTestDesc aRs6000_DoubleTests[] = { - { TT_EGREP, zRs6000_DoubleSelect0, (regex_t*)NULL }, }; +#define NESTED_AUTH_DES_TEST_CT 1 +static tTestDesc aNested_Auth_DesTests[] = { + { TT_EGREP, zNested_Auth_DesSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Rs6000_Double + * Fix Command Arguments for Nested_Auth_Des */ -static const char* apzRs6000_DoublePatch[] = { +static const char* apzNested_Auth_DesPatch[] = { "format", - "#ifndef __cplusplus\n\ -%0\n\ -#endif", - "^.*[^a-zA-Z_]class\\(.*", + "%1*/ /*", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Rs6000_Fchmod fix + * Description of Netbsd_C99_Inline_1 fix */ -tSCC zRs6000_FchmodName[] = - "rs6000_fchmod"; +tSCC zNetbsd_C99_Inline_1Name[] = + "netbsd_c99_inline_1"; /* * File name selection pattern */ -tSCC zRs6000_FchmodList[] = - "|sys/stat.h|"; +tSCC zNetbsd_C99_Inline_1List[] = + "signal.h\0"; /* * Machine/OS name selection pattern */ -#define apzRs6000_FchmodMachs (const char**)NULL +tSCC* apzNetbsd_C99_Inline_1Machs[] = { + "*-*-netbsd*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zRs6000_FchmodSelect0[] = - "fchmod\\(char \\*"; +tSCC zNetbsd_C99_Inline_1Select0[] = + "extern __inline int"; -#define RS6000_FCHMOD_TEST_CT 1 -static tTestDesc aRs6000_FchmodTests[] = { - { TT_EGREP, zRs6000_FchmodSelect0, (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 Rs6000_Fchmod + * Fix Command Arguments for Netbsd_C99_Inline_1 */ -static const char* apzRs6000_FchmodPatch[] = { +static const char* apzNetbsd_C99_Inline_1Patch[] = { "format", - "fchmod(int", + "extern\n\ +#ifdef __GNUC_STDC_INLINE__\n\ +__attribute__((__gnu_inline__))\n\ +#endif\n\ +__inline int", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Rs6000_Param fix + * Description of Netbsd_C99_Inline_2 fix */ -tSCC zRs6000_ParamName[] = - "rs6000_param"; +tSCC zNetbsd_C99_Inline_2Name[] = + "netbsd_c99_inline_2"; /* * File name selection pattern */ -tSCC zRs6000_ParamList[] = - "|stdio.h|unistd.h|"; +tSCC zNetbsd_C99_Inline_2List[] = + "signal.h\0"; /* * Machine/OS name selection pattern */ -#define apzRs6000_ParamMachs (const char**)NULL +tSCC* apzNetbsd_C99_Inline_2Machs[] = { + "*-*-netbsd*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zRs6000_ParamSelect0[] = - "rename\\(const char \\*old, const char \\*new\\)"; +tSCC zNetbsd_C99_Inline_2Select0[] = + "#define _SIGINLINE extern __inline"; -#define RS6000_PARAM_TEST_CT 1 -static tTestDesc aRs6000_ParamTests[] = { - { TT_EGREP, zRs6000_ParamSelect0, (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 Rs6000_Param + * Fix Command Arguments for Netbsd_C99_Inline_2 */ -static const char* apzRs6000_ParamPatch[] = { +static const char* apzNetbsd_C99_Inline_2Patch[] = { "format", - "rename(const char *_old, const char *_new)", + "#ifdef __GNUC_STDC_INLINE__\n\ +#define _SIGINLINE extern __attribute__((__gnu_inline__)) __inline\n\ +#else\n\ +%0\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sco_Math fix + * Description of Netbsd_Extra_Semicolon fix */ -tSCC zSco_MathName[] = - "sco_math"; +tSCC zNetbsd_Extra_SemicolonName[] = + "netbsd_extra_semicolon"; /* * 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|"; +tSCC zNetbsd_Extra_SemicolonList[] = + "sys/cdefs.h\0"; /* * Machine/OS name selection pattern */ -#define apzSco_MathMachs (const char**)NULL +tSCC* apzNetbsd_Extra_SemicolonMachs[] = { + "*-*-netbsd*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zSco_MathSelect0[] = - "inline double abs"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSco_MathBypass0[] = - "__GNUG__"; +tSCC zNetbsd_Extra_SemicolonSelect0[] = + "#define[ \t]*__END_DECLS[ \t]*};"; -#define SCO_MATH_TEST_CT 2 -static tTestDesc aSco_MathTests[] = { - { TT_NEGREP, zSco_MathBypass0, (regex_t*)NULL }, - { TT_EGREP, zSco_MathSelect0, (regex_t*)NULL }, }; +#define NETBSD_EXTRA_SEMICOLON_TEST_CT 1 +static tTestDesc aNetbsd_Extra_SemicolonTests[] = { + { TT_EGREP, zNetbsd_Extra_SemicolonSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Sco_Math + * Fix Command Arguments for Netbsd_Extra_Semicolon */ -static const char* apzSco_MathPatch[] = { "sed", - "-e", "/#define.*__fp_class(a) \\\\/i\\\n\ -#ifndef __GNUC__\n", - "-e", "/.*__builtin_generic/a\\\n\ -#else\\\n\ -#define __fp_class(a) \\\\\\\n\ - __builtin_choose_expr(__builtin_types_compatible_p(typeof(a),long double),\\\\\\\n\ - __fpclassifyl(a), \\\\\\\n\ - __builtin_choose_expr(__builtin_types_compatible_p(typeof(a), float), \\\\\\\n\ - __fpclassifyf(a),__fpclassify(a)))\\\n\ -#endif", - "-e", "/extern \"C\\+\\+\"/N;/inline double abs/i\\\n\ -#ifndef __GNUC__\n", - "-e", "/inline long double trunc/N;/inline long double trunc.*}.*extern \"C\\+\\+\"/a\\\n\ -#endif /* ! __GNUC__ */", +static const char* apzNetbsd_Extra_SemicolonPatch[] = { + "format", + "#define __END_DECLS }", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sco_Regset fix + * Description of Newlib_Stdint_1 fix */ -tSCC zSco_RegsetName[] = - "sco_regset"; +tSCC zNewlib_Stdint_1Name[] = + "newlib_stdint_1"; /* * File name selection pattern */ -tSCC zSco_RegsetList[] = - "|sys/regset.h|"; +tSCC zNewlib_Stdint_1List[] = + "stdint-newlib.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzSco_RegsetMachs[] = { - "*-*-sco3.2v5*", - (const char*)NULL }; +#define apzNewlib_Stdint_1Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSco_RegsetSelect0[] = - "(struct[ \t]+.*)fpstate"; +tSCC zNewlib_Stdint_1Select0[] = + "@todo - Add support for wint_t types"; -#define SCO_REGSET_TEST_CT 1 -static tTestDesc aSco_RegsetTests[] = { - { TT_EGREP, zSco_RegsetSelect0, (regex_t*)NULL }, }; +#define NEWLIB_STDINT_1_TEST_CT 1 +static tTestDesc aNewlib_Stdint_1Tests[] = { + { TT_EGREP, zNewlib_Stdint_1Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Sco_Regset + * Fix Command Arguments for Newlib_Stdint_1 */ -static const char* apzSco_RegsetPatch[] = { - "format", - "%1rsfpstate", +static const char* apzNewlib_Stdint_1Patch[] = { sed_cmd_z, + "-e", "s@#define INT32_MIN.*@#define INT32_MIN (-INT32_MAX - 1)@", + "-e", "s@#define INT32_MAX.*@#define INT32_MAX __INT32_MAX__@", + "-e", "s@#define UINT32_MAX.*@#define UINT32_MAX __UINT32_MAX__@", + "-e", "s@#define INT_LEAST32_MIN.*@#define INT_LEAST32_MIN (-INT_LEAST32_MAX - 1)@", + "-e", "s@#define INT_LEAST32_MAX.*@#define INT_LEAST32_MAX __INT_LEAST32_MAX__@", + "-e", "s@#define UINT_LEAST32_MAX.*@#define UINT_LEAST32_MAX __UINT_LEAST32_MAX__@", + "-e", "s@#define INT_FAST\\([0-9]*\\)_MIN.*@#define INT_FAST\\1_MIN (-INT_FAST\\1_MAX - 1)@", + "-e", "s@#define INT_FAST\\([0-9]*\\)_MAX.*@#define INT_FAST\\1_MAX __INT_FAST\\1_MAX__@", + "-e", "s@#define UINT_FAST\\([0-9]*\\)_MAX.*@#define UINT_FAST\\1_MAX __UINT_FAST\\1_MAX__@", + "-e", "s@#define SIZE_MAX.*@#define SIZE_MAX __SIZE_MAX__@", + "-e", "s@#define PTRDIFF_MIN.*@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@", + "-e", "s@#define PTRDIFF_MAX.*@#define PTRDIFF_MAX __PTRDIFF_MAX__@", + "-e", "s@#define UINT8_C.*@#define UINT8_C(c) __UINT8_C(c)@", + "-e", "s@#define UINT16_C.*@#define UINT16_C(c) __UINT16_C(c)@", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sco_Static_Func fix + * Description of Newlib_Stdint_2 fix */ -tSCC zSco_Static_FuncName[] = - "sco_static_func"; +tSCC zNewlib_Stdint_2Name[] = + "newlib_stdint_2"; /* * File name selection pattern */ -tSCC zSco_Static_FuncList[] = - "|sys/stat.h|"; +tSCC zNewlib_Stdint_2List[] = + "stdint-newlib.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzSco_Static_FuncMachs[] = { - "i?86-*-sco3.2*", - (const char*)NULL }; +#define apzNewlib_Stdint_2Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSco_Static_FuncSelect0[] = - "^static int"; +tSCC zNewlib_Stdint_2Select0[] = + "@todo - Add support for wint_t types"; -#define SCO_STATIC_FUNC_TEST_CT 1 -static tTestDesc aSco_Static_FuncTests[] = { - { TT_EGREP, zSco_Static_FuncSelect0, (regex_t*)NULL }, }; +#define NEWLIB_STDINT_2_TEST_CT 1 +static tTestDesc aNewlib_Stdint_2Tests[] = { + { TT_EGREP, zNewlib_Stdint_2Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Sco_Static_Func + * Fix Command Arguments for Newlib_Stdint_2 */ -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 */", +static const char* apzNewlib_Stdint_2Patch[] = { + "format", + "#define INTMAX_MAX __INTMAX_MAX__\n\ +#define INTMAX_MIN (-INTMAX_MAX - 1)\n\ +#define UINTMAX_MAX __UINTMAX_MAX__\n\ +#define WCHAR_MAX __WCHAR_MAX__\n\ +#define WCHAR_MIN __WCHAR_MIN__\n\ +#define WINT_MAX __WINT_MAX__\n\ +#define WINT_MIN __WINT_MIN__\n\n\ +%0", + "/\\*\\* Macros for minimum-width integer constant expressions \\*/", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sco_Utime fix + * Description of Next_Math_Prefix fix */ -tSCC zSco_UtimeName[] = - "sco_utime"; +tSCC zNext_Math_PrefixName[] = + "next_math_prefix"; /* * File name selection pattern */ -tSCC zSco_UtimeList[] = - "|sys/times.h|"; +tSCC zNext_Math_PrefixList[] = + "ansi/math.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzSco_UtimeMachs[] = { - "i?86-*-sco3.2v4*", - (const char*)NULL }; +#define apzNext_Math_PrefixMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSco_UtimeSelect0[] = - "\\(const char \\*, struct utimbuf \\*\\);"; +tSCC zNext_Math_PrefixSelect0[] = + "^extern[ \t]+double[ \t]+__const__[ \t]"; -#define SCO_UTIME_TEST_CT 1 -static tTestDesc aSco_UtimeTests[] = { - { TT_EGREP, zSco_UtimeSelect0, (regex_t*)NULL }, }; +#define NEXT_MATH_PREFIX_TEST_CT 1 +static tTestDesc aNext_Math_PrefixTests[] = { + { TT_EGREP, zNext_Math_PrefixSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Sco_Utime + * Fix Command Arguments for Next_Math_Prefix */ -static const char* apzSco_UtimePatch[] = { +static const char* apzNext_Math_PrefixPatch[] = { "format", - "(const char *, const struct utimbuf *);", + "extern double %1(", + "^extern[ \t]+double[ \t]+__const__[ \t]+([a-z]+)\\(", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Math_1 fix + * Description of Next_Template fix */ -tSCC zSolaris_Math_1Name[] = - "solaris_math_1"; +tSCC zNext_TemplateName[] = + "next_template"; /* * File name selection pattern */ -tSCC zSolaris_Math_1List[] = - "|iso/math_c99.h|"; +tSCC zNext_TemplateList[] = + "bsd/libc.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Math_1Machs (const char**)NULL +#define apzNext_TemplateMachs (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__"; +tSCC zNext_TemplateSelect0[] = + "[ \t]template\\)"; -#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 }, }; +#define NEXT_TEMPLATE_TEST_CT 1 +static tTestDesc aNext_TemplateTests[] = { + { TT_EGREP, zNext_TemplateSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Math_1 + * Fix Command Arguments for Next_Template */ -static const char* apzSolaris_Math_1Patch[] = { +static const char* apzNext_TemplatePatch[] = { "format", - "#define\tHUGE_VA%1\t(__builtin_huge_va%2())", - "^#define[ \t]+HUGE_VA([LF]+)[ \t]+__builtin_huge_va([lf]+)", + "(%1)", + "\\(([^)]*)[ \t]template\\)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Math_2 fix + * Description of Next_Volitile fix */ -tSCC zSolaris_Math_2Name[] = - "solaris_math_2"; +tSCC zNext_VolitileName[] = + "next_volitile"; /* * File name selection pattern */ -tSCC zSolaris_Math_2List[] = - "|iso/math_c99.h|"; +tSCC zNext_VolitileList[] = + "ansi/stdlib.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Math_2Machs (const char**)NULL +#define apzNext_VolitileMachs (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 - */ -tSCC zSolaris_Math_2Bypass0[] = - "__GNUC__"; +tSCC zNext_VolitileSelect0[] = + "^extern[ \t]+volatile[ \t]+void[ \t]"; -#define SOLARIS_MATH_2_TEST_CT 2 -static tTestDesc aSolaris_Math_2Tests[] = { - { TT_NEGREP, zSolaris_Math_2Bypass0, (regex_t*)NULL }, - { TT_EGREP, zSolaris_Math_2Select0, (regex_t*)NULL }, }; +#define NEXT_VOLITILE_TEST_CT 1 +static tTestDesc aNext_VolitileTests[] = { + { TT_EGREP, zNext_VolitileSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Math_2 + * Fix Command Arguments for Next_Volitile */ -static const char* apzSolaris_Math_2Patch[] = { +static const char* apzNext_VolitilePatch[] = { "format", - "#define\tINFINITY\t(__builtin_inff())", - "^#define[ \t]+INFINITY[ \t]+__builtin_infinity", + "extern void %1(", + "^extern[ \t]+volatile[ \t]+void[ \t]+(exit|abort)\\(", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Math_3 fix + * Description of Next_Wait_Union fix */ -tSCC zSolaris_Math_3Name[] = - "solaris_math_3"; +tSCC zNext_Wait_UnionName[] = + "next_wait_union"; /* * File name selection pattern */ -tSCC zSolaris_Math_3List[] = - "|iso/math_c99.h|"; +tSCC zNext_Wait_UnionList[] = + "sys/wait.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Math_3Machs (const char**)NULL +#define apzNext_Wait_UnionMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSolaris_Math_3Select0[] = - "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSolaris_Math_3Bypass0[] = - "__GNUC__"; +tSCC zNext_Wait_UnionSelect0[] = + "wait\\(union wait"; -#define SOLARIS_MATH_3_TEST_CT 2 -static tTestDesc aSolaris_Math_3Tests[] = { - { TT_NEGREP, zSolaris_Math_3Bypass0, (regex_t*)NULL }, - { TT_EGREP, zSolaris_Math_3Select0, (regex_t*)NULL }, }; +#define NEXT_WAIT_UNION_TEST_CT 1 +static tTestDesc aNext_Wait_UnionTests[] = { + { TT_EGREP, zNext_Wait_UnionSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Math_3 + * Fix Command Arguments for Next_Wait_Union */ -static const char* apzSolaris_Math_3Patch[] = { +static const char* apzNext_Wait_UnionPatch[] = { "format", - "#define\tNAN\t\t(__builtin_nanf(\"\"))", - "^#define[ \t]+NAN[ \t]+__builtin_nan", + "wait(void", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Math_4 fix + * Description of Nodeent_Syntax fix */ -tSCC zSolaris_Math_4Name[] = - "solaris_math_4"; +tSCC zNodeent_SyntaxName[] = + "nodeent_syntax"; /* * File name selection pattern */ -tSCC zSolaris_Math_4List[] = - "|iso/math_c99.h|"; +tSCC zNodeent_SyntaxList[] = + "netdnet/dnetdb.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Math_4Machs (const char**)NULL +#define apzNodeent_SyntaxMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSolaris_Math_4Select0[] = - "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSolaris_Math_4Bypass0[] = - "__GNUC__"; +tSCC zNodeent_SyntaxSelect0[] = + "char[ \t]*\\*na_addr[ \t]*$"; -#define SOLARIS_MATH_4_TEST_CT 2 -static tTestDesc aSolaris_Math_4Tests[] = { - { TT_NEGREP, zSolaris_Math_4Bypass0, (regex_t*)NULL }, - { TT_EGREP, zSolaris_Math_4Select0, (regex_t*)NULL }, }; +#define NODEENT_SYNTAX_TEST_CT 1 +static tTestDesc aNodeent_SyntaxTests[] = { + { TT_EGREP, zNodeent_SyntaxSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Math_4 + * Fix Command Arguments for Nodeent_Syntax */ -static const char* apzSolaris_Math_4Patch[] = { +static const char* apzNodeent_SyntaxPatch[] = { "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; })", - "^#define[ \t]+fpclassify\\(x\\)[ \t]+__builtin_fpclassify\\(x\\)", + "%0;", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Math_5 fix + * Description of Openbsd_Null_Definition fix */ -tSCC zSolaris_Math_5Name[] = - "solaris_math_5"; +tSCC zOpenbsd_Null_DefinitionName[] = + "openbsd_null_definition"; /* * File name selection pattern */ -tSCC zSolaris_Math_5List[] = - "|iso/math_c99.h|"; +tSCC zOpenbsd_Null_DefinitionList[] = + "locale.h\0stddef.h\0stdio.h\0string.h\0time.h\0unistd.h\0wchar.h\0sys/param.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Math_5Machs (const char**)NULL +tSCC* apzOpenbsd_Null_DefinitionMachs[] = { + "*-*-openbsd*", + (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__"; +tSCC zOpenbsd_Null_DefinitionSelect0[] = + "__GNUG__"; -#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 }, }; +#define OPENBSD_NULL_DEFINITION_TEST_CT 1 +static tTestDesc aOpenbsd_Null_DefinitionTests[] = { + { TT_EGREP, zOpenbsd_Null_DefinitionSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Math_5 + * Fix Command Arguments for Openbsd_Null_Definition */ -static const char* apzSolaris_Math_5Patch[] = { +static const char* apzOpenbsd_Null_DefinitionPatch[] = { "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\\)", + "#ifndef NULL\n\ +#ifdef __cplusplus\n\ +#ifdef __GNUG__\n\ +#define NULL\t__null\n\ +#else\t /* ! __GNUG__ */\n\ +#define NULL\t0L\n\ +#endif\t /* __GNUG__ */\n\ +#else\t /* ! __cplusplus */\n\ +#define NULL\t((void *)0)\n\ +#endif\t /* __cplusplus */\n\ +#endif\t /* !NULL */", + "^#ifndef[ \t]*NULL\n\ +^#ifdef[ \t]*__GNUG__\n\ +^#define[ \t]*NULL[ \t]*__null\n\ +^#else\n\ +^#define[ \t]*NULL[ \t]*0L\n\ +^#endif\n\ +^#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Math_6 fix + * Description of Obstack_Lvalue_Cast fix */ -tSCC zSolaris_Math_6Name[] = - "solaris_math_6"; +tSCC zObstack_Lvalue_CastName[] = + "obstack_lvalue_cast"; /* * File name selection pattern */ -tSCC zSolaris_Math_6List[] = - "|iso/math_c99.h|"; +tSCC zObstack_Lvalue_CastList[] = + "obstack.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Math_6Machs (const char**)NULL +#define apzObstack_Lvalue_CastMachs (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__"; +tSCC zObstack_Lvalue_CastSelect0[] = + "\\*\\(\\(([^()]*)\\*\\)(.*)\\)\\+\\+ = \\(([^()]*)\\)"; -#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 }, }; +#define OBSTACK_LVALUE_CAST_TEST_CT 1 +static tTestDesc aObstack_Lvalue_CastTests[] = { + { TT_EGREP, zObstack_Lvalue_CastSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Math_6 + * Fix Command Arguments for Obstack_Lvalue_Cast */ -static const char* apzSolaris_Math_6Patch[] = { +static const char* apzObstack_Lvalue_CastPatch[] = { "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\\)", + "((*((%1*)%2) = (%3)), (%2 += sizeof (%1)))", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Math_7 fix + * Description of Openbsd_Va_Start fix */ -tSCC zSolaris_Math_7Name[] = - "solaris_math_7"; +tSCC zOpenbsd_Va_StartName[] = + "openbsd_va_start"; /* * File name selection pattern */ -tSCC zSolaris_Math_7List[] = - "|iso/math_c99.h|"; +tSCC zOpenbsd_Va_StartList[] = + "stdarg.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Math_7Machs (const char**)NULL +tSCC* apzOpenbsd_Va_StartMachs[] = { + "*-*-openbsd*", + (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__"; +tSCC zOpenbsd_Va_StartSelect0[] = + "__builtin_stdarg_start"; -#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 }, }; +#define OPENBSD_VA_START_TEST_CT 1 +static tTestDesc aOpenbsd_Va_StartTests[] = { + { TT_EGREP, zOpenbsd_Va_StartSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Math_7 + * Fix Command Arguments for Openbsd_Va_Start */ -static const char* apzSolaris_Math_7Patch[] = { +static const char* apzOpenbsd_Va_StartPatch[] = { "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\\)", + "__builtin_va_start", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Math_8 fix + * Description of Osf_Namespace_A fix */ -tSCC zSolaris_Math_8Name[] = - "solaris_math_8"; +tSCC zOsf_Namespace_AName[] = + "osf_namespace_a"; /* * File name selection pattern */ -tSCC zSolaris_Math_8List[] = - "|iso/math_c99.h|"; +tSCC zOsf_Namespace_AList[] = + "reg_types.h\0sys/lc_core.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Math_8Machs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSolaris_Math_8Select0[] = - "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; +#define apzOsf_Namespace_AMachs (const char**)NULL /* - * content bypass pattern - skip fix if pattern found + * perform the 'test' shell command - do fix on success */ -tSCC zSolaris_Math_8Bypass0[] = - "__GNUC__"; +tSCC zOsf_Namespace_ATest0[] = + " -r reg_types.h"; +tSCC zOsf_Namespace_ATest1[] = + " -r sys/lc_core.h"; +tSCC zOsf_Namespace_ATest2[] = + " -n \"`grep '} regex_t;' reg_types.h`\""; +tSCC zOsf_Namespace_ATest3[] = + " -z \"`grep __regex_t regex.h`\""; -#define SOLARIS_MATH_8_TEST_CT 2 -static tTestDesc aSolaris_Math_8Tests[] = { - { TT_NEGREP, zSolaris_Math_8Bypass0, (regex_t*)NULL }, - { TT_EGREP, zSolaris_Math_8Select0, (regex_t*)NULL }, }; +#define OSF_NAMESPACE_A_TEST_CT 4 +static tTestDesc aOsf_Namespace_ATests[] = { + { TT_TEST, zOsf_Namespace_ATest0, 0 /* unused */ }, + { TT_TEST, zOsf_Namespace_ATest1, 0 /* unused */ }, + { TT_TEST, zOsf_Namespace_ATest2, 0 /* unused */ }, + { TT_TEST, zOsf_Namespace_ATest3, 0 /* unused */ }, }; /* - * Fix Command Arguments for Solaris_Math_8 + * Fix Command Arguments for Osf_Namespace_A */ -static const char* apzSolaris_Math_8Patch[] = { +static const char* apzOsf_Namespace_APatch[] = { "format", - "#define\tsignbit(x)\t(sizeof(x) == sizeof(float) \\\n\ -\t\t\t ? __builtin_signbitf(x) \\\n\ -\t\t\t : sizeof(x) == sizeof(long double) \\\n\ -\t\t\t ? __builtin_signbitl(x) \\\n\ -\t\t\t : __builtin_signbit(x))", - "^#define[ \t]+signbit\\(x\\)[ \t]+__builtin_signbit\\(x\\)", + "__%0", + "reg(ex|off|match)_t", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Math_9 fix + * Description of Osf_Namespace_C fix */ -tSCC zSolaris_Math_9Name[] = - "solaris_math_9"; +tSCC zOsf_Namespace_CName[] = + "osf_namespace_c"; /* * File name selection pattern */ -tSCC zSolaris_Math_9List[] = - "|iso/math_c99.h|"; +tSCC zOsf_Namespace_CList[] = + "regex.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Math_9Machs (const char**)NULL +#define apzOsf_Namespace_CMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSolaris_Math_9Select0[] = - "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; +tSCC zOsf_Namespace_CSelect0[] = + "#include .*"; /* - * content bypass pattern - skip fix if pattern found + * perform the 'test' shell command - do fix on success */ -tSCC zSolaris_Math_9Bypass0[] = - "__GNUC__"; +tSCC zOsf_Namespace_CTest0[] = + " -r reg_types.h"; +tSCC zOsf_Namespace_CTest1[] = + " -r sys/lc_core.h"; +tSCC zOsf_Namespace_CTest2[] = + " -n \"`grep '} regex_t;' reg_types.h`\""; +tSCC zOsf_Namespace_CTest3[] = + " -z \"`grep __regex_t regex.h`\""; -#define SOLARIS_MATH_9_TEST_CT 2 -static tTestDesc aSolaris_Math_9Tests[] = { - { TT_NEGREP, zSolaris_Math_9Bypass0, (regex_t*)NULL }, - { TT_EGREP, zSolaris_Math_9Select0, (regex_t*)NULL }, }; +#define OSF_NAMESPACE_C_TEST_CT 5 +static tTestDesc aOsf_Namespace_CTests[] = { + { TT_TEST, zOsf_Namespace_CTest0, 0 /* unused */ }, + { TT_TEST, zOsf_Namespace_CTest1, 0 /* unused */ }, + { TT_TEST, zOsf_Namespace_CTest2, 0 /* unused */ }, + { TT_TEST, zOsf_Namespace_CTest3, 0 /* unused */ }, + { TT_EGREP, zOsf_Namespace_CSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Math_9 + * Fix Command Arguments for Osf_Namespace_C */ -static const char* apzSolaris_Math_9Patch[] = { +static const char* apzOsf_Namespace_CPatch[] = { "format", - "#define\t%1(x, y)%2__builtin_%1(x, y)", - "^#define[ \t]+([a-z]+)\\(x, y\\)([ \t]+)\\(\\(x\\) __builtin_[a-z]+\\(y\\)\\)", + "%0\n\ +typedef __regex_t\tregex_t;\n\ +typedef __regoff_t\tregoff_t;\n\ +typedef __regmatch_t\tregmatch_t;", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Mutex_Init_1 fix + * Description of Pthread_Incomplete_Struct_Argument fix */ -tSCC zSolaris_Mutex_Init_1Name[] = - "solaris_mutex_init_1"; +tSCC zPthread_Incomplete_Struct_ArgumentName[] = + "pthread_incomplete_struct_argument"; /* * File name selection pattern */ -tSCC zSolaris_Mutex_Init_1List[] = - "|pthread.h|"; +tSCC zPthread_Incomplete_Struct_ArgumentList[] = + "pthread.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Mutex_Init_1Machs (const char**)NULL +#define apzPthread_Incomplete_Struct_ArgumentMachs (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 zPthread_Incomplete_Struct_ArgumentSelect0[] = + "struct __jmp_buf_tag"; -#define SOLARIS_MUTEX_INIT_1_TEST_CT 1 -static tTestDesc aSolaris_Mutex_Init_1Tests[] = { - { TT_EGREP, zSolaris_Mutex_Init_1Select0, (regex_t*)NULL }, }; +#define PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT 1 +static tTestDesc aPthread_Incomplete_Struct_ArgumentTests[] = { + { TT_EGREP, zPthread_Incomplete_Struct_ArgumentSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Mutex_Init_1 + * Fix Command Arguments for Pthread_Incomplete_Struct_Argument */ -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* apzPthread_Incomplete_Struct_ArgumentPatch[] = { + "format", + "%1 *%2%3", + "^(extern int __sigsetjmp \\(struct __jmp_buf_tag) (__env)\\[1\\](.*)$", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Mutex_Init_2 fix + * Description of Read_Ret_Type fix */ -tSCC zSolaris_Mutex_Init_2Name[] = - "solaris_mutex_init_2"; +tSCC zRead_Ret_TypeName[] = + "read_ret_type"; /* * File name selection pattern */ -tSCC zSolaris_Mutex_Init_2List[] = - "|pthread.h|"; +tSCC zRead_Ret_TypeList[] = + "stdio.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzSolaris_Mutex_Init_2Machs[] = { - "*-*-solaris2.[0-9]", - "*-*-solaris2.[0-9][!0-9]*", - (const char*)NULL }; +#define apzRead_Ret_TypeMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSolaris_Mutex_Init_2Select0[] = - "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; +tSCC zRead_Ret_TypeSelect0[] = + "extern int\t.*, fread\\(\\), fwrite\\(\\)"; -#define SOLARIS_MUTEX_INIT_2_TEST_CT 1 -static tTestDesc aSolaris_Mutex_Init_2Tests[] = { - { TT_EGREP, zSolaris_Mutex_Init_2Select0, (regex_t*)NULL }, }; +#define READ_RET_TYPE_TEST_CT 1 +static tTestDesc aRead_Ret_TypeTests[] = { + { TT_EGREP, zRead_Ret_TypeSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Mutex_Init_2 + * Fix Command Arguments for Read_Ret_Type */ -static const char* apzSolaris_Mutex_Init_2Patch[] = { +static const char* apzRead_Ret_TypePatch[] = { "format", - "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\ -%0\n\ -#else\n\ -%1, {0}}%4\n\ -#endif", - "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+(|/*.**/[ \t]*\\\\\n\ -[ \t]*)\\{.*),[ \t]*0\\}(|[ \t].*)$", + "extern unsigned int fread(), fwrite();\n\ +%1%2", + "(extern int\t.*), fread\\(\\), fwrite\\(\\)(.*)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Rwlock_Init_1 fix + * Description of Rpc_Xdr_Lvalue_Cast_A fix */ -tSCC zSolaris_Rwlock_Init_1Name[] = - "solaris_rwlock_init_1"; +tSCC zRpc_Xdr_Lvalue_Cast_AName[] = + "rpc_xdr_lvalue_cast_a"; /* * File name selection pattern */ -tSCC zSolaris_Rwlock_Init_1List[] = - "|pthread.h|"; +tSCC zRpc_Xdr_Lvalue_Cast_AList[] = + "rpc/xdr.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzSolaris_Rwlock_Init_1Machs[] = { - "*-*-solaris*", - (const char*)NULL }; +#define apzRpc_Xdr_Lvalue_Cast_AMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSolaris_Rwlock_Init_1Select0[] = - "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; +tSCC zRpc_Xdr_Lvalue_Cast_ASelect0[] = + "#define[ \t]*IXDR_GET_LONG.*\\\\\n\ +.*__extension__.*"; -#define SOLARIS_RWLOCK_INIT_1_TEST_CT 1 -static tTestDesc aSolaris_Rwlock_Init_1Tests[] = { - { TT_EGREP, zSolaris_Rwlock_Init_1Select0, (regex_t*)NULL }, }; +#define RPC_XDR_LVALUE_CAST_A_TEST_CT 1 +static tTestDesc aRpc_Xdr_Lvalue_Cast_ATests[] = { + { TT_EGREP, zRpc_Xdr_Lvalue_Cast_ASelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Rwlock_Init_1 + * Fix Command Arguments for Rpc_Xdr_Lvalue_Cast_A */ -static const char* apzSolaris_Rwlock_Init_1Patch[] = { +static const char* apzRpc_Xdr_Lvalue_Cast_APatch[] = { "format", - "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\ -%0\n\ -#else\n\ -%1{0, 0, 0, {{0}, {0}, {0}}, {{0}, {0}}, {{0}, {0}}}\n\ -#endif", - "(^#define[ \t]+PTHREAD_RWLOCK_INITIALIZER[ \t]+)\\{0, 0, 0, \\{0, 0, 0\\}, \\{0, 0\\}, \\{0, 0\\}\\}[ \t]*$", + "#define IXDR_GET_LONG(buf) ((long)IXDR_GET_U_INT32(buf))", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Once_Init_1 fix + * Description of Rpc_Xdr_Lvalue_Cast_B fix */ -tSCC zSolaris_Once_Init_1Name[] = - "solaris_once_init_1"; +tSCC zRpc_Xdr_Lvalue_Cast_BName[] = + "rpc_xdr_lvalue_cast_b"; /* * File name selection pattern */ -tSCC zSolaris_Once_Init_1List[] = - "|pthread.h|"; +tSCC zRpc_Xdr_Lvalue_Cast_BList[] = + "rpc/xdr.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzSolaris_Once_Init_1Machs[] = { - "*-*-solaris*", - (const char*)NULL }; +#define apzRpc_Xdr_Lvalue_Cast_BMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSolaris_Once_Init_1Select0[] = - "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; +tSCC zRpc_Xdr_Lvalue_Cast_BSelect0[] = + "#define[ \t]*IXDR_PUT_LONG.*\\\\\n\ +.*__extension__.*"; -#define SOLARIS_ONCE_INIT_1_TEST_CT 1 -static tTestDesc aSolaris_Once_Init_1Tests[] = { - { TT_EGREP, zSolaris_Once_Init_1Select0, (regex_t*)NULL }, }; +#define RPC_XDR_LVALUE_CAST_B_TEST_CT 1 +static tTestDesc aRpc_Xdr_Lvalue_Cast_BTests[] = { + { TT_EGREP, zRpc_Xdr_Lvalue_Cast_BSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Once_Init_1 + * Fix Command Arguments for Rpc_Xdr_Lvalue_Cast_B */ -static const char* apzSolaris_Once_Init_1Patch[] = { +static const char* apzRpc_Xdr_Lvalue_Cast_BPatch[] = { "format", - "%1{%2}%3", - "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{)([^}]+)(\\})[ \t]*$", + "#define IXDR_PUT_LONG(buf, v) ((long)IXDR_PUT_INT32(buf, (long)(v)))", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Once_Init_2 fix + * Description of Rs6000_Double fix */ -tSCC zSolaris_Once_Init_2Name[] = - "solaris_once_init_2"; +tSCC zRs6000_DoubleName[] = + "rs6000_double"; /* * File name selection pattern */ -tSCC zSolaris_Once_Init_2List[] = - "|pthread.h|"; +tSCC zRs6000_DoubleList[] = + "math.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzSolaris_Once_Init_2Machs[] = { - "*-*-solaris2.[0-9]", - "*-*-solaris2.[0-9][!0-9]*", - (const char*)NULL }; +#define apzRs6000_DoubleMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSolaris_Once_Init_2Select0[] = - "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; +tSCC zRs6000_DoubleSelect0[] = + "[^a-zA-Z_]class\\("; -#define SOLARIS_ONCE_INIT_2_TEST_CT 1 -static tTestDesc aSolaris_Once_Init_2Tests[] = { - { TT_EGREP, zSolaris_Once_Init_2Select0, (regex_t*)NULL }, }; +#define RS6000_DOUBLE_TEST_CT 1 +static tTestDesc aRs6000_DoubleTests[] = { + { TT_EGREP, zRs6000_DoubleSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Once_Init_2 + * Fix Command Arguments for Rs6000_Double */ -static const char* apzSolaris_Once_Init_2Patch[] = { +static const char* apzRs6000_DoublePatch[] = { "format", - "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\ + "#ifndef __cplusplus\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]*$", + "^.*[^a-zA-Z_]class\\(.*", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Socket fix + * Description of Rs6000_Fchmod fix */ -tSCC zSolaris_SocketName[] = - "solaris_socket"; +tSCC zRs6000_FchmodName[] = + "rs6000_fchmod"; /* * File name selection pattern */ -tSCC zSolaris_SocketList[] = - "|sys/socket.h|"; +tSCC zRs6000_FchmodList[] = + "sys/stat.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_SocketMachs (const char**)NULL +#define apzRs6000_FchmodMachs (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 zRs6000_FchmodSelect0[] = + "fchmod\\(char \\*"; -#define SOLARIS_SOCKET_TEST_CT 1 -static tTestDesc aSolaris_SocketTests[] = { - { TT_EGREP, zSolaris_SocketSelect0, (regex_t*)NULL }, }; +#define RS6000_FCHMOD_TEST_CT 1 +static tTestDesc aRs6000_FchmodTests[] = { + { TT_EGREP, zRs6000_FchmodSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Socket + * Fix Command Arguments for Rs6000_Fchmod */ -static const char* apzSolaris_SocketPatch[] = { +static const char* apzRs6000_FchmodPatch[] = { "format", - "extern int %1(int, %2void *, int, int);", - "^extern int (recv|send)\\(int, (const )*char \\*, int, int\\);", + "fchmod(int", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Stdio_Tag fix + * Description of Rs6000_Param fix */ -tSCC zSolaris_Stdio_TagName[] = - "solaris_stdio_tag"; +tSCC zRs6000_ParamName[] = + "rs6000_param"; /* * File name selection pattern */ -tSCC zSolaris_Stdio_TagList[] = - "|stdio_tag.h|"; +tSCC zRs6000_ParamList[] = + "stdio.h\0unistd.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Stdio_TagMachs (const char**)NULL +#define apzRs6000_ParamMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSolaris_Stdio_TagSelect0[] = - "__cplusplus < 54321L"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSolaris_Stdio_TagBypass0[] = - "__GNUC__"; +tSCC zRs6000_ParamSelect0[] = + "rename\\(const char \\*old, const char \\*new\\)"; -#define SOLARIS_STDIO_TAG_TEST_CT 2 -static tTestDesc aSolaris_Stdio_TagTests[] = { - { TT_NEGREP, zSolaris_Stdio_TagBypass0, (regex_t*)NULL }, - { TT_EGREP, zSolaris_Stdio_TagSelect0, (regex_t*)NULL }, }; +#define RS6000_PARAM_TEST_CT 1 +static tTestDesc aRs6000_ParamTests[] = { + { TT_EGREP, zRs6000_ParamSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Stdio_Tag + * Fix Command Arguments for Rs6000_Param */ -static const char* apzSolaris_Stdio_TagPatch[] = { "sed", - "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/", +static const char* apzRs6000_ParamPatch[] = { + "format", + "rename(const char *_old, const char *_new)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Unistd fix + * Description of Solaris___Restrict fix */ -tSCC zSolaris_UnistdName[] = - "solaris_unistd"; +tSCC zSolaris___RestrictName[] = + "solaris___restrict"; /* * File name selection pattern */ -tSCC zSolaris_UnistdList[] = - "|unistd.h|"; +tSCC zSolaris___RestrictList[] = + "sys/feature_tests.h\0"; /* * Machine/OS name selection pattern */ -#define apzSolaris_UnistdMachs (const char**)NULL +tSCC* apzSolaris___RestrictMachs[] = { + "*-*-solaris2*", + (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"; +tSCC zSolaris___RestrictSelect0[] = + "#define[ \t]*_RESTRICT_KYWD[ \t]*restrict"; -#define SOLARIS_UNISTD_TEST_CT 2 -static tTestDesc aSolaris_UnistdTests[] = { - { TT_NEGREP, zSolaris_UnistdBypass0, (regex_t*)NULL }, - { TT_EGREP, zSolaris_UnistdSelect0, (regex_t*)NULL }, }; +#define SOLARIS___RESTRICT_TEST_CT 1 +static tTestDesc aSolaris___RestrictTests[] = { + { TT_EGREP, zSolaris___RestrictSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Unistd + * Fix Command Arguments for Solaris___Restrict */ -static const char* apzSolaris_UnistdPatch[] = { +static const char* apzSolaris___RestrictPatch[] = { "format", - "extern int getpagesize();\n\ -%0", - "^extern (pid_t|int) getpgid\\(.*\\);", + "#ifdef __cplusplus\n\ +#define\t_RESTRICT_KYWD\t__restrict\n\ +#else\n\ +%0\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Widec fix + * Description of Solaris_Complex fix */ -tSCC zSolaris_WidecName[] = - "solaris_widec"; +tSCC zSolaris_ComplexName[] = + "solaris_complex"; /* * File name selection pattern */ -tSCC zSolaris_WidecList[] = - "|widec.h|"; +tSCC zSolaris_ComplexList[] = + "complex.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzSolaris_WidecMachs[] = { - "*-*-solaris2.[0-5]", - "*-*-solaris2.[0-5].*", +tSCC* apzSolaris_ComplexMachs[] = { + "*-*-solaris2.*", (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zSolaris_WidecSelect0[] = - "#include "; +tSCC zSolaris_ComplexSelect0[] = + "#define[ \t]_Complex_I[ \t]_Complex_I"; -/* - * 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 }, }; +#define SOLARIS_COMPLEX_TEST_CT 1 +static tTestDesc aSolaris_ComplexTests[] = { + { TT_EGREP, zSolaris_ComplexSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Widec + * Fix Command Arguments for Solaris_Complex */ -static const char* apzSolaris_WidecPatch[] = { - "format", - "%0\n\ -#include ", +static const char* apzSolaris_ComplexPatch[] = { sed_cmd_z, + "-e", "s/#define[ \t]_Complex_I[ \t]_Complex_I/#define\t_Complex_I\t(__extension__ 1.0iF)/", + "-e", "/#define[ \t]_Imaginary_I[ \t]_Imaginary_I/d", + "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d", + "-e", "s/#define[ \t]I[ \t]\\{1,\\}_Imaginary_I/#define\tI\t\t_Complex_I/", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Statsswtch fix + * Description of Solaris_Complex_Cxx fix */ -tSCC zStatsswtchName[] = - "statsswtch"; +tSCC zSolaris_Complex_CxxName[] = + "solaris_complex_cxx"; /* * File name selection pattern */ -tSCC zStatsswtchList[] = - "|rpcsvc/rstat.h|"; +tSCC zSolaris_Complex_CxxList[] = + "complex.h\0"; /* * Machine/OS name selection pattern */ -#define apzStatsswtchMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zStatsswtchSelect0[] = - "boottime$"; - -#define STATSSWTCH_TEST_CT 1 -static tTestDesc aStatsswtchTests[] = { - { TT_EGREP, zStatsswtchSelect0, (regex_t*)NULL }, }; +tSCC* apzSolaris_Complex_CxxMachs[] = { + "*-*-solaris2.*", + (const char*)NULL }; +#define SOLARIS_COMPLEX_CXX_TEST_CT 0 +#define aSolaris_Complex_CxxTests (tTestDesc*)NULL /* - * Fix Command Arguments for Statsswtch + * Fix Command Arguments for Solaris_Complex_Cxx */ -static const char* apzStatsswtchPatch[] = { - "format", - "boottime;", +static const char* apzSolaris_Complex_CxxPatch[] = { sed_cmd_z, + "-e", "/#if[ \t]*!defined(__cplusplus)/c#ifdef\t__cplusplus\\\n\ +extern \"C\" {\\\n\ +#endif", + "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c#ifdef\t__cplusplus\\\n\ +}\\\n\ +#endif", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Stdio_Stdarg_H fix + * Description of Solaris_Cond_Init fix */ -tSCC zStdio_Stdarg_HName[] = - "stdio_stdarg_h"; +tSCC zSolaris_Cond_InitName[] = + "solaris_cond_init"; /* * File name selection pattern */ -tSCC zStdio_Stdarg_HList[] = - "|stdio.h|"; +tSCC zSolaris_Cond_InitList[] = + "pthread.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzStdio_Stdarg_HMachs[] = { - "*-*-solaris2.1[0-9]*", +tSCC* apzSolaris_Cond_InitMachs[] = { + "*-*-solaris2.8", (const char*)NULL }; /* - * content bypass pattern - skip fix if pattern found + * content selection pattern - do fix if pattern found */ -tSCC zStdio_Stdarg_HBypass0[] = - "include.*(stdarg.h|machine/ansi.h)"; +tSCC zSolaris_Cond_InitSelect0[] = + "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; -#define STDIO_STDARG_H_TEST_CT 1 -static tTestDesc aStdio_Stdarg_HTests[] = { - { TT_NEGREP, zStdio_Stdarg_HBypass0, (regex_t*)NULL }, }; +#define SOLARIS_COND_INIT_TEST_CT 1 +static tTestDesc aSolaris_Cond_InitTests[] = { + { TT_EGREP, zSolaris_Cond_InitSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Stdio_Stdarg_H + * Fix Command Arguments for Solaris_Cond_Init */ -static const char* apzStdio_Stdarg_HPatch[] = { - "wrap", - "#define __need___va_list\n\ -#include \n", +static const char* apzSolaris_Cond_InitPatch[] = { + "format", + "%1, 0x4356%2", + "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+\\{.*0)(\\},[ \t]*0\\}.*)$", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Stdio_Va_List fix + * Description of Solaris_Math_1 fix */ -tSCC zStdio_Va_ListName[] = - "stdio_va_list"; +tSCC zSolaris_Math_1Name[] = + "solaris_math_1"; /* * File name selection pattern */ -tSCC zStdio_Va_ListList[] = - "|stdio.h|internal/stdio_core.h|internal/wchar_core.h|"; +tSCC zSolaris_Math_1List[] = + "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzStdio_Va_ListMachs[] = { - "*-*-solaris2.1[0-9]*", - (const char*)NULL }; +#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 zStdio_Va_ListBypass0[] = - "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list"; +tSCC zSolaris_Math_1Bypass0[] = + "__GNUC__"; -#define STDIO_VA_LIST_TEST_CT 1 -static tTestDesc aStdio_Va_ListTests[] = { - { TT_NEGREP, zStdio_Va_ListBypass0, (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 Stdio_Va_List + * Fix Command Arguments for Solaris_Math_1 */ -static const char* apzStdio_Va_ListPatch[] = { "sed", - "-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\ -s@ __VA_LIST__));@ __gnuc_va_list));@\n\ -s@ va_list@ __not_va_list__@\n\ -s@\\*va_list@*__not_va_list__@\n\ -s@ __va_list)@ __gnuc_va_list)@\n\ -s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\ -s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n\ -s@GNUC_VA_LIST@GNUC_Va_LIST@\n\ -s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n\ -s@_NEED___VA_LIST@_NEED___Va_LIST@\n\ -s@VA_LIST@DUMMY_VA_LIST@\n\ -s@_Va_LIST@_VA_LIST@", +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 Stdio_Va_List_Clients fix + * Description of Solaris_Math_2 fix */ -tSCC zStdio_Va_List_ClientsName[] = - "stdio_va_list_clients"; +tSCC zSolaris_Math_2Name[] = + "solaris_math_2"; /* * 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|"; +tSCC zSolaris_Math_2List[] = + "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ -#define apzStdio_Va_List_ClientsMachs (const char**)NULL +#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 */ -tSCC zStdio_Va_List_ClientsBypass0[] = - "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list"; -tSCC zStdio_Va_List_ClientsBypass1[] = - "include |#ifdef va_start"; +tSCC zSolaris_Math_2Bypass0[] = + "__GNUC__"; -#define STDIO_VA_LIST_CLIENTS_TEST_CT 2 -static tTestDesc aStdio_Va_List_ClientsTests[] = { - { TT_NEGREP, zStdio_Va_List_ClientsBypass0, (regex_t*)NULL }, - { TT_NEGREP, zStdio_Va_List_ClientsBypass1, (regex_t*)NULL }, }; +#define SOLARIS_MATH_2_TEST_CT 2 +static tTestDesc aSolaris_Math_2Tests[] = { + { TT_NEGREP, zSolaris_Math_2Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_2Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Stdio_Va_List_Clients + * Fix Command Arguments for Solaris_Math_2 */ -static const char* apzStdio_Va_List_ClientsPatch[] = { "sed", - "-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\ -s@ __VA_LIST__));@ __gnuc_va_list));@\n\ -s@ va_list@ __not_va_list__@\n\ -s@\\*va_list@*__not_va_list__@\n\ -s@ __va_list)@ __gnuc_va_list)@\n\ -s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\ -s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n\ -s@GNUC_VA_LIST@GNUC_Va_LIST@\n\ -s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n\ -s@_NEED___VA_LIST@_NEED___Va_LIST@\n\ -s@VA_LIST@DUMMY_VA_LIST@\n\ -s@_Va_LIST@_VA_LIST@", +static const char* apzSolaris_Math_2Patch[] = { + "format", + "#define\tINFINITY\t(__builtin_inff())", + "^#define[ \t]+INFINITY[ \t]+__builtin_infinity", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Strict_Ansi_Not fix + * Description of Solaris_Math_3 fix */ -tSCC zStrict_Ansi_NotName[] = - "strict_ansi_not"; +tSCC zSolaris_Math_3Name[] = + "solaris_math_3"; /* * File name selection pattern */ -#define zStrict_Ansi_NotList (char*)NULL +tSCC zSolaris_Math_3List[] = + "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ -#define apzStrict_Ansi_NotMachs (const char**)NULL +#define apzSolaris_Math_3Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zStrict_Ansi_NotSelect0[] = - "^([ \t]*#[ \t]*if.*)(!__STDC__|__STDC__[ \t]*==[ \t]*0|__STDC__[ \t]*!=[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)"; +tSCC zSolaris_Math_3Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; /* * content bypass pattern - skip fix if pattern found */ -tSCC zStrict_Ansi_NotBypass0[] = - "GNU and MIPS C compilers define __STDC__ differently"; -tSCC zStrict_Ansi_NotBypass1[] = - "__SCO_VERSION__.*__STDC__ != 1"; - -/* - * perform the C function call test - */ -tSCC zStrict_Ansi_NotFTst0[] = "stdc_0_in_system_headers"; +tSCC zSolaris_Math_3Bypass0[] = + "__GNUC__"; -#define STRICT_ANSI_NOT_TEST_CT 4 -static tTestDesc aStrict_Ansi_NotTests[] = { - { TT_FUNCTION, zStrict_Ansi_NotFTst0, 0 /* unused */ }, - { TT_NEGREP, zStrict_Ansi_NotBypass0, (regex_t*)NULL }, - { TT_NEGREP, zStrict_Ansi_NotBypass1, (regex_t*)NULL }, - { TT_EGREP, zStrict_Ansi_NotSelect0, (regex_t*)NULL }, }; +#define SOLARIS_MATH_3_TEST_CT 2 +static tTestDesc aSolaris_Math_3Tests[] = { + { TT_NEGREP, zSolaris_Math_3Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_3Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Strict_Ansi_Not + * Fix Command Arguments for Solaris_Math_3 */ -static const char* apzStrict_Ansi_NotPatch[] = { +static const char* apzSolaris_Math_3Patch[] = { "format", - "%1 !defined(__STRICT_ANSI__)", + "#define\tNAN\t\t(__builtin_nanf(\"\"))", + "^#define[ \t]+NAN[ \t]+__builtin_nan", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Strict_Ansi_Not_Ctd fix + * Description of Solaris_Math_4 fix */ -tSCC zStrict_Ansi_Not_CtdName[] = - "strict_ansi_not_ctd"; +tSCC zSolaris_Math_4Name[] = + "solaris_math_4"; /* * File name selection pattern */ -tSCC zStrict_Ansi_Not_CtdList[] = - "|math.h|limits.h|stdio.h|signal.h|stdlib.h|sys/signal.h|time.h|"; +tSCC zSolaris_Math_4List[] = + "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ -#define apzStrict_Ansi_Not_CtdMachs (const char**)NULL +#define apzSolaris_Math_4Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zStrict_Ansi_Not_CtdSelect0[] = - "^([ \t]*(\\(|&&|\\|\\|)([ \t(]*!*[ \t]*defined\\([a-zA-Z_0-9]+\\)[ \t]*[|&][|&])*[ \t(]*)(__STDC__[ \t]*(|-[ \t]*0[ \t]*)==[ \t]*0)"; +tSCC zSolaris_Math_4Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; /* - * perform the C function call test + * content bypass pattern - skip fix if pattern found */ -tSCC zStrict_Ansi_Not_CtdFTst0[] = "stdc_0_in_system_headers"; +tSCC zSolaris_Math_4Bypass0[] = + "__GNUC__"; -#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 }, }; +#define SOLARIS_MATH_4_TEST_CT 2 +static tTestDesc aSolaris_Math_4Tests[] = { + { TT_NEGREP, zSolaris_Math_4Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_4Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Strict_Ansi_Not_Ctd + * Fix Command Arguments for Solaris_Math_4 */ -static const char* apzStrict_Ansi_Not_CtdPatch[] = { +static const char* apzSolaris_Math_4Patch[] = { "format", - "%1 !defined(__STRICT_ANSI__)", + "#define\tfpclassify(x) \\\n\ + __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 Strict_Ansi_Only fix + * Description of Solaris_Math_8 fix */ -tSCC zStrict_Ansi_OnlyName[] = - "strict_ansi_only"; +tSCC zSolaris_Math_8Name[] = + "solaris_math_8"; /* * File name selection pattern */ -#define zStrict_Ansi_OnlyList (char*)NULL +tSCC zSolaris_Math_8List[] = + "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ -#define apzStrict_Ansi_OnlyMachs (const char**)NULL +#define apzSolaris_Math_8Machs (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)"; +tSCC zSolaris_Math_8Select0[] = + "@\\(#\\)math_c99\\.h[ \t]+1\\.[0-9]+[ \t]+[0-9/]+ SMI"; /* - * perform the C function call test + * content bypass pattern - skip fix if pattern found */ -tSCC zStrict_Ansi_OnlyFTst0[] = "stdc_0_in_system_headers"; +tSCC zSolaris_Math_8Bypass0[] = + "__GNUC__"; -#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 }, }; +#define SOLARIS_MATH_8_TEST_CT 2 +static tTestDesc aSolaris_Math_8Tests[] = { + { TT_NEGREP, zSolaris_Math_8Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_8Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Strict_Ansi_Only + * Fix Command Arguments for Solaris_Math_8 */ -static const char* apzStrict_Ansi_OnlyPatch[] = { +static const char* apzSolaris_Math_8Patch[] = { "format", - "%1 defined(__STRICT_ANSI__)", + "#define\tsignbit(x)\t(sizeof(x) == sizeof(float) \\\n\ +\t\t\t ? __builtin_signbitf(x) \\\n\ +\t\t\t : sizeof(x) == sizeof(long double) \\\n\ +\t\t\t ? __builtin_signbitl(x) \\\n\ +\t\t\t : __builtin_signbit(x))", + "^#define[ \t]+signbit\\(x\\)[ \t]+__builtin_signbit\\(x\\)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Struct_File fix + * Description of Solaris_Math_9 fix */ -tSCC zStruct_FileName[] = - "struct_file"; +tSCC zSolaris_Math_9Name[] = + "solaris_math_9"; /* * File name selection pattern */ -tSCC zStruct_FileList[] = - "|rpc/xdr.h|"; +tSCC zSolaris_Math_9List[] = + "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ -#define apzStruct_FileMachs (const char**)NULL +#define apzSolaris_Math_9Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zStruct_FileSelect0[] = - "^.*xdrstdio_create.*struct __file_s"; +tSCC zSolaris_Math_9Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; -#define STRUCT_FILE_TEST_CT 1 -static tTestDesc aStruct_FileTests[] = { - { TT_EGREP, zStruct_FileSelect0, (regex_t*)NULL }, }; +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSolaris_Math_9Bypass0[] = + "__GNUC__"; + +#define SOLARIS_MATH_9_TEST_CT 2 +static tTestDesc aSolaris_Math_9Tests[] = { + { TT_NEGREP, zSolaris_Math_9Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_9Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Struct_File + * Fix Command Arguments for Solaris_Math_9 */ -static const char* apzStruct_FilePatch[] = { +static const char* apzSolaris_Math_9Patch[] = { "format", - "struct __file_s;\n\ -%0", + "#define\t%1(x, y)%2__builtin_%1(x, y)", + "^#define[ \t]+([a-z]+)\\(x, y\\)([ \t]+)\\(\\(x\\) __builtin_[a-z]+\\(y\\)\\)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Struct_Sockaddr fix + * Description of Solaris_Math_10 fix */ -tSCC zStruct_SockaddrName[] = - "struct_sockaddr"; +tSCC zSolaris_Math_10Name[] = + "solaris_math_10"; /* * File name selection pattern */ -tSCC zStruct_SockaddrList[] = - "|rpc/auth.h|"; +tSCC zSolaris_Math_10List[] = + "iso/math_c99.h\0"; /* * Machine/OS name selection pattern */ -#define apzStruct_SockaddrMachs (const char**)NULL +#define apzSolaris_Math_10Machs (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"; +tSCC zSolaris_Math_10Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; -#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 }, }; +#define SOLARIS_MATH_10_TEST_CT 1 +static tTestDesc aSolaris_Math_10Tests[] = { + { TT_EGREP, zSolaris_Math_10Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Struct_Sockaddr + * Fix Command Arguments for Solaris_Math_10 */ -static const char* apzStruct_SockaddrPatch[] = { +static const char* apzSolaris_Math_10Patch[] = { "format", - "struct sockaddr;\n\ -%0", + "#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 }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sun_Auth_Proto fix + * Description of Solaris_Mutex_Init_2 fix */ -tSCC zSun_Auth_ProtoName[] = - "sun_auth_proto"; +tSCC zSolaris_Mutex_Init_2Name[] = + "solaris_mutex_init_2"; /* * File name selection pattern */ -tSCC zSun_Auth_ProtoList[] = - "|rpc/auth.h|rpc/clnt.h|rpc/svc.h|rpc/xdr.h|"; +tSCC zSolaris_Mutex_Init_2List[] = + "pthread.h\0"; /* * Machine/OS name selection pattern */ -#define apzSun_Auth_ProtoMachs (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 */ -tSCC zSun_Auth_ProtoSelect0[] = - "\\(\\*[a-z][a-z_]*\\)\\(\\)"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSun_Auth_ProtoBypass0[] = - "__cplusplus"; +tSCC zSolaris_Mutex_Init_2Select0[] = + "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; -#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 }, }; +#define SOLARIS_MUTEX_INIT_2_TEST_CT 1 +static tTestDesc aSolaris_Mutex_Init_2Tests[] = { + { TT_EGREP, zSolaris_Mutex_Init_2Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Sun_Auth_Proto + * Fix Command Arguments for Solaris_Mutex_Init_2 */ -static const char* apzSun_Auth_ProtoPatch[] = { +static const char* apzSolaris_Mutex_Init_2Patch[] = { "format", - "#ifdef __cplusplus\n\ -%1(...);%2\n\ + "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\ +%0\n\ #else\n\ -%1();%2\n\ +%1, {0}}%4\n\ #endif", - "(.*\\(\\*[a-z][a-z_]*\\))\\(\\);(.*)", + "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+(|/*.**/[ \t]*\\\\\n\ +[ \t]*)\\{.*),[ \t]*0\\}(|[ \t].*)$", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sun_Bogus_Ifdef fix + * Description of Solaris_Rwlock_Init_1 fix */ -tSCC zSun_Bogus_IfdefName[] = - "sun_bogus_ifdef"; +tSCC zSolaris_Rwlock_Init_1Name[] = + "solaris_rwlock_init_1"; /* * File name selection pattern */ -tSCC zSun_Bogus_IfdefList[] = - "|hsfs/hsfs_spec.h|hsfs/iso_spec.h|"; +tSCC zSolaris_Rwlock_Init_1List[] = + "pthread.h\0"; /* * Machine/OS name selection pattern */ -#define apzSun_Bogus_IfdefMachs (const char**)NULL +tSCC* apzSolaris_Rwlock_Init_1Machs[] = { + "*-*-solaris*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zSun_Bogus_IfdefSelect0[] = - "#ifdef(.*\\|\\|.*)"; +tSCC zSolaris_Rwlock_Init_1Select0[] = + "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; -#define SUN_BOGUS_IFDEF_TEST_CT 1 -static tTestDesc aSun_Bogus_IfdefTests[] = { - { TT_EGREP, zSun_Bogus_IfdefSelect0, (regex_t*)NULL }, }; +#define SOLARIS_RWLOCK_INIT_1_TEST_CT 1 +static tTestDesc aSolaris_Rwlock_Init_1Tests[] = { + { TT_EGREP, zSolaris_Rwlock_Init_1Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Sun_Bogus_Ifdef + * Fix Command Arguments for Solaris_Rwlock_Init_1 */ -static const char* apzSun_Bogus_IfdefPatch[] = { +static const char* apzSolaris_Rwlock_Init_1Patch[] = { "format", - "#if%1", + "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\ +%0\n\ +#else\n\ +%1{0, 0, 0, {{0}, {0}, {0}}, {{0}, {0}}, {{0}, {0}}}\n\ +#endif", + "(^#define[ \t]+PTHREAD_RWLOCK_INITIALIZER[ \t]+)\\{0, 0, 0, \\{0, 0, 0\\}, \\{0, 0\\}, \\{0, 0\\}\\}[ \t]*$", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sun_Catmacro fix + * Description of Solaris_Once_Init_1 fix */ -tSCC zSun_CatmacroName[] = - "sun_catmacro"; +tSCC zSolaris_Once_Init_1Name[] = + "solaris_once_init_1"; /* * File name selection pattern */ -tSCC zSun_CatmacroList[] = - "|pixrect/memvar.h|"; +tSCC zSolaris_Once_Init_1List[] = + "pthread.h\0"; /* * Machine/OS name selection pattern */ -#define apzSun_CatmacroMachs (const char**)NULL +tSCC* apzSolaris_Once_Init_1Machs[] = { + "*-*-solaris*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zSun_CatmacroSelect0[] = - "^#define[ \t]+CAT\\(a,b\\).*"; +tSCC zSolaris_Once_Init_1Select0[] = + "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; -#define SUN_CATMACRO_TEST_CT 1 -static tTestDesc aSun_CatmacroTests[] = { - { TT_EGREP, zSun_CatmacroSelect0, (regex_t*)NULL }, }; +#define SOLARIS_ONCE_INIT_1_TEST_CT 1 +static tTestDesc aSolaris_Once_Init_1Tests[] = { + { TT_EGREP, zSolaris_Once_Init_1Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Sun_Catmacro + * Fix Command Arguments for Solaris_Once_Init_1 */ -static const char* apzSun_CatmacroPatch[] = { +static const char* apzSolaris_Once_Init_1Patch[] = { "format", - "#ifdef __STDC__\n\ -# define CAT(a,b) a##b\n\ -#else\n\ -%0\n\ -#endif", + "%1{%2}%3", + "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{)([^}]+)(\\})[ \t]*$", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sun_Malloc fix + * Description of Solaris_Once_Init_2 fix */ -tSCC zSun_MallocName[] = - "sun_malloc"; +tSCC zSolaris_Once_Init_2Name[] = + "solaris_once_init_2"; /* * File name selection pattern */ -tSCC zSun_MallocList[] = - "|malloc.h|"; +tSCC zSolaris_Once_Init_2List[] = + "pthread.h\0"; /* * Machine/OS name selection pattern */ -#define apzSun_MallocMachs (const char**)NULL +tSCC* apzSolaris_Once_Init_2Machs[] = { + "*-*-solaris2.[0-9]", + "*-*-solaris2.[0-9][!0-9]*", + (const char*)NULL }; /* - * content bypass pattern - skip fix if pattern found + * content selection pattern - do fix if pattern found */ -tSCC zSun_MallocBypass0[] = - "_CLASSIC_ANSI_TYPES"; +tSCC zSolaris_Once_Init_2Select0[] = + "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; -#define SUN_MALLOC_TEST_CT 1 -static tTestDesc aSun_MallocTests[] = { - { TT_NEGREP, zSun_MallocBypass0, (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 Sun_Malloc + * Fix Command Arguments for Solaris_Once_Init_2 */ -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", +static const char* apzSolaris_Once_Init_2Patch[] = { + "format", + "#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 }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sun_Rusers_Semi fix + * Description of Solaris_Int_Const fix */ -tSCC zSun_Rusers_SemiName[] = - "sun_rusers_semi"; +tSCC zSolaris_Int_ConstName[] = + "solaris_int_const"; /* * File name selection pattern */ -tSCC zSun_Rusers_SemiList[] = - "|rpcsvc/rusers.h|"; +tSCC zSolaris_Int_ConstList[] = + "sys/int_const.h\0"; /* * Machine/OS name selection pattern */ -#define apzSun_Rusers_SemiMachs (const char**)NULL +tSCC* apzSolaris_Int_ConstMachs[] = { + "*-*-solaris2*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zSun_Rusers_SemiSelect0[] = - "_cnt$"; +tSCC zSolaris_Int_ConstSelect0[] = + "^#define[ \t]+UINT8_C\\(c\\)[ \t]+__CONCAT__.*\n\ +(/*.**/)\n\ +#define[ \t]+UINT16_C\\(c\\)[ \t]+__CONCAT__.*"; -#define SUN_RUSERS_SEMI_TEST_CT 1 -static tTestDesc aSun_Rusers_SemiTests[] = { - { TT_EGREP, zSun_Rusers_SemiSelect0, (regex_t*)NULL }, }; +#define SOLARIS_INT_CONST_TEST_CT 1 +static tTestDesc aSolaris_Int_ConstTests[] = { + { TT_EGREP, zSolaris_Int_ConstSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Sun_Rusers_Semi + * Fix Command Arguments for Solaris_Int_Const */ -static const char* apzSun_Rusers_SemiPatch[] = { "sed", - "-e", "/^struct/,/^};/s/_cnt$/_cnt;/", +static const char* apzSolaris_Int_ConstPatch[] = { + "format", + "#define\tUINT8_C(c)\t(c)\n\ +%1\n\ +#define\tUINT16_C(c)\t(c)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sun_Signal fix + * Description of Solaris_Int_Limits_1 fix */ -tSCC zSun_SignalName[] = - "sun_signal"; +tSCC zSolaris_Int_Limits_1Name[] = + "solaris_int_limits_1"; /* * File name selection pattern */ -tSCC zSun_SignalList[] = - "|sys/signal.h|signal.h|"; +tSCC zSolaris_Int_Limits_1List[] = + "sys/int_limits.h\0"; /* * Machine/OS name selection pattern */ -#define apzSun_SignalMachs (const char**)NULL +tSCC* apzSolaris_Int_Limits_1Machs[] = { + "*-*-solaris2*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zSun_SignalSelect0[] = - "^void\t\\(\\*signal\\(\\)\\)\\(\\);.*"; +tSCC zSolaris_Int_Limits_1Select0[] = + "^#define[ \t]+UINT8_MAX[ \t]+\\(255U\\)\n\ +#define[ \t]+UINT16_MAX[ \t]+\\(65535U\\)"; -#define SUN_SIGNAL_TEST_CT 1 -static tTestDesc aSun_SignalTests[] = { - { TT_EGREP, zSun_SignalSelect0, (regex_t*)NULL }, }; +#define SOLARIS_INT_LIMITS_1_TEST_CT 1 +static tTestDesc aSolaris_Int_Limits_1Tests[] = { + { TT_EGREP, zSolaris_Int_Limits_1Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Sun_Signal + * Fix Command Arguments for Solaris_Int_Limits_1 */ -static const char* apzSun_SignalPatch[] = { +static const char* apzSolaris_Int_Limits_1Patch[] = { "format", - "#ifdef __cplusplus\n\ -void\t(*signal(...))(...);\n\ -#else\n\ -%0\n\ -#endif", + "#define\tUINT8_MAX\t(255)\n\ +#define\tUINT16_MAX\t(65535)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sunos_Strlen fix + * Description of Solaris_Int_Limits_2 fix */ -tSCC zSunos_StrlenName[] = - "sunos_strlen"; +tSCC zSolaris_Int_Limits_2Name[] = + "solaris_int_limits_2"; /* * File name selection pattern */ -tSCC zSunos_StrlenList[] = - "|strings.h|"; +tSCC zSolaris_Int_Limits_2List[] = + "sys/int_limits.h\0"; /* * Machine/OS name selection pattern */ -#define apzSunos_StrlenMachs (const char**)NULL +tSCC* apzSolaris_Int_Limits_2Machs[] = { + "*-*-solaris2*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zSunos_StrlenSelect0[] = - "int[ \t]*strlen\\(\\);(.*)"; +tSCC zSolaris_Int_Limits_2Select0[] = + "^#define[ \t]+(INT|UINT)_FAST16_(MAX|MIN)[ \t](INT|UINT)16.*"; -#define SUNOS_STRLEN_TEST_CT 1 -static tTestDesc aSunos_StrlenTests[] = { - { TT_EGREP, zSunos_StrlenSelect0, (regex_t*)NULL }, }; +#define SOLARIS_INT_LIMITS_2_TEST_CT 1 +static tTestDesc aSolaris_Int_Limits_2Tests[] = { + { TT_EGREP, zSolaris_Int_Limits_2Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Sunos_Strlen + * Fix Command Arguments for Solaris_Int_Limits_2 */ -static const char* apzSunos_StrlenPatch[] = { +static const char* apzSolaris_Int_Limits_2Patch[] = { "format", - "__SIZE_TYPE__ strlen();%1", + "#define\t%1_FAST16_%2 %132_%2", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Svr4_Disable_Opt fix + * Description of Solaris_Int_Limits_3 fix */ -tSCC zSvr4_Disable_OptName[] = - "svr4_disable_opt"; +tSCC zSolaris_Int_Limits_3Name[] = + "solaris_int_limits_3"; /* * File name selection pattern */ -tSCC zSvr4_Disable_OptList[] = - "|string.h|"; +tSCC zSolaris_Int_Limits_3List[] = + "sys/int_limits.h\0"; /* * Machine/OS name selection pattern */ -#define apzSvr4_Disable_OptMachs (const char**)NULL +tSCC* apzSolaris_Int_Limits_3Machs[] = { + "*-*-solaris2*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zSvr4_Disable_OptSelect0[] = - "#define.*__std_hdr_"; +tSCC zSolaris_Int_Limits_3Select0[] = + "^#define[ \t]+SIZE_MAX[ \t]+4294967295UL"; -#define SVR4_DISABLE_OPT_TEST_CT 1 -static tTestDesc aSvr4_Disable_OptTests[] = { - { TT_EGREP, zSvr4_Disable_OptSelect0, (regex_t*)NULL }, }; +#define SOLARIS_INT_LIMITS_3_TEST_CT 1 +static tTestDesc aSolaris_Int_Limits_3Tests[] = { + { TT_EGREP, zSolaris_Int_Limits_3Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Svr4_Disable_Opt + * Fix Command Arguments for Solaris_Int_Limits_3 */ -static const char* apzSvr4_Disable_OptPatch[] = { "sed", - "-e", "/#define.*__std_hdr_/d", +static const char* apzSolaris_Int_Limits_3Patch[] = { + "format", + "#define\tSIZE_MAX\t4294967295U", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Svr4_Getcwd fix + * Description of Solaris_Int_Types fix */ -tSCC zSvr4_GetcwdName[] = - "svr4_getcwd"; +tSCC zSolaris_Int_TypesName[] = + "solaris_int_types"; /* * File name selection pattern */ -tSCC zSvr4_GetcwdList[] = - "|stdlib.h|unistd.h|prototypes.h|"; +tSCC zSolaris_Int_TypesList[] = + "sys/int_types.h\0"; /* * Machine/OS name selection pattern */ -#define apzSvr4_GetcwdMachs (const char**)NULL +#define apzSolaris_Int_TypesMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSvr4_GetcwdSelect0[] = - "getcwd\\(char \\*, int\\)"; +tSCC zSolaris_Int_TypesSelect0[] = + "__STDC__ - 0 == 0"; -#define SVR4_GETCWD_TEST_CT 1 -static tTestDesc aSvr4_GetcwdTests[] = { - { TT_EGREP, zSvr4_GetcwdSelect0, (regex_t*)NULL }, }; +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSolaris_Int_TypesBypass0[] = + "_LONGLONG_TYPE"; + +#define SOLARIS_INT_TYPES_TEST_CT 2 +static tTestDesc aSolaris_Int_TypesTests[] = { + { TT_NEGREP, zSolaris_Int_TypesBypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Int_TypesSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Svr4_Getcwd + * Fix Command Arguments for Solaris_Int_Types */ -static const char* apzSvr4_GetcwdPatch[] = { +static const char* apzSolaris_Int_TypesPatch[] = { "format", - "getcwd(char *, size_t)", + "(defined(_STDC_C99) || !defined(_STRICT_STDC) || defined(__GNUC__))", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Svr4_Krnl fix + * Description of Solaris_Stdio_Tag fix */ -tSCC zSvr4_KrnlName[] = - "svr4_krnl"; +tSCC zSolaris_Stdio_TagName[] = + "solaris_stdio_tag"; /* * 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|"; +tSCC zSolaris_Stdio_TagList[] = + "stdio_tag.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzSvr4_KrnlMachs[] = { - "*-*-sysv4*", - "i?86-sequent-ptx*", - (const char*)NULL }; +#define apzSolaris_Stdio_TagMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Stdio_TagSelect0[] = + "__cplusplus < 54321L"; /* * content bypass pattern - skip fix if pattern found */ -tSCC zSvr4_KrnlBypass0[] = - "_KERNEL"; +tSCC zSolaris_Stdio_TagBypass0[] = + "__GNUC__"; -#define SVR4_KRNL_TEST_CT 1 -static tTestDesc aSvr4_KrnlTests[] = { - { TT_NEGREP, zSvr4_KrnlBypass0, (regex_t*)NULL }, }; +#define SOLARIS_STDIO_TAG_TEST_CT 2 +static tTestDesc aSolaris_Stdio_TagTests[] = { + { TT_NEGREP, zSolaris_Stdio_TagBypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Stdio_TagSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Svr4_Krnl + * Fix Command Arguments for Solaris_Stdio_Tag */ -static const char* apzSvr4_KrnlPatch[] = { - "wrap", - "#ifdef _KERNEL\n", - "#endif /* _KERNEL */\n", +static const char* apzSolaris_Stdio_TagPatch[] = { sed_cmd_z, + "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Svr4_Profil fix + * Description of Statsswtch fix */ -tSCC zSvr4_ProfilName[] = - "svr4_profil"; +tSCC zStatsswtchName[] = + "statsswtch"; /* * File name selection pattern */ -tSCC zSvr4_ProfilList[] = - "|stdlib.h|unistd.h|"; +tSCC zStatsswtchList[] = + "rpcsvc/rstat.h\0"; /* * Machine/OS name selection pattern */ -#define apzSvr4_ProfilMachs (const char**)NULL +#define apzStatsswtchMachs (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"; +tSCC zStatsswtchSelect0[] = + "boottime$"; -#define SVR4_PROFIL_TEST_CT 2 -static tTestDesc aSvr4_ProfilTests[] = { - { TT_NEGREP, zSvr4_ProfilBypass0, (regex_t*)NULL }, - { TT_EGREP, zSvr4_ProfilSelect0, (regex_t*)NULL }, }; +#define STATSSWTCH_TEST_CT 1 +static tTestDesc aStatsswtchTests[] = { + { TT_EGREP, zStatsswtchSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Svr4_Profil + * Fix Command Arguments for Statsswtch */ -static const char* apzSvr4_ProfilPatch[] = { +static const char* apzStatsswtchPatch[] = { "format", - "profil(unsigned short *, size_t, int, unsigned int)", + "boottime;", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Svr4_Sighandler_Type fix + * Description of Stdio_Stdarg_H fix */ -tSCC zSvr4_Sighandler_TypeName[] = - "svr4_sighandler_type"; +tSCC zStdio_Stdarg_HName[] = + "stdio_stdarg_h"; /* * File name selection pattern */ -tSCC zSvr4_Sighandler_TypeList[] = - "|sys/signal.h|"; +tSCC zStdio_Stdarg_HList[] = + "stdio.h\0"; /* * Machine/OS name selection pattern */ -#define apzSvr4_Sighandler_TypeMachs (const char**)NULL +tSCC* apzStdio_Stdarg_HMachs[] = { + "*-*-solaris2.1[0-9]*", + (const char*)NULL }; /* - * content selection pattern - do fix if pattern found + * content bypass pattern - skip fix if pattern found */ -tSCC zSvr4_Sighandler_TypeSelect0[] = - "void *\\(\\*\\)\\(\\)"; +tSCC zStdio_Stdarg_HBypass0[] = + "include.*(stdarg.h|machine/ansi.h)"; -#define SVR4_SIGHANDLER_TYPE_TEST_CT 1 -static tTestDesc aSvr4_Sighandler_TypeTests[] = { - { TT_EGREP, zSvr4_Sighandler_TypeSelect0, (regex_t*)NULL }, }; +#define STDIO_STDARG_H_TEST_CT 1 +static tTestDesc aStdio_Stdarg_HTests[] = { + { TT_NEGREP, zStdio_Stdarg_HBypass0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Svr4_Sighandler_Type + * Fix Command Arguments for Stdio_Stdarg_H */ -static const char* apzSvr4_Sighandler_TypePatch[] = { - "format", - "void (*)(int)", +static const char* apzStdio_Stdarg_HPatch[] = { + "wrap", + "#define __need___va_list\n\ +#include \n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Svr4_Undeclared_Getrnge fix + * Description of Stdio_Va_List fix */ -tSCC zSvr4_Undeclared_GetrngeName[] = - "svr4_undeclared_getrnge"; +tSCC zStdio_Va_ListName[] = + "stdio_va_list"; /* * File name selection pattern */ -tSCC zSvr4_Undeclared_GetrngeList[] = - "|regexp.h|"; +tSCC zStdio_Va_ListList[] = + "stdio.h\0internal/stdio_core.h\0internal/wchar_core.h\0"; /* * Machine/OS name selection pattern */ -#define apzSvr4_Undeclared_GetrngeMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSvr4_Undeclared_GetrngeSelect0[] = - "getrnge"; +tSCC* apzStdio_Va_ListMachs[] = { + "*-*-solaris2.1[0-9]*", + (const char*)NULL }; /* * content bypass pattern - skip fix if pattern found */ -tSCC zSvr4_Undeclared_GetrngeBypass0[] = - "static void getrnge"; +tSCC zStdio_Va_ListBypass0[] = + "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list"; -#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 }, }; +#define STDIO_VA_LIST_TEST_CT 1 +static tTestDesc aStdio_Va_ListTests[] = { + { TT_NEGREP, zStdio_Va_ListBypass0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Svr4_Undeclared_Getrnge + * Fix Command Arguments for Stdio_Va_List */ -static const char* apzSvr4_Undeclared_GetrngePatch[] = { - "format", - "%0\n\ -static int getrnge ();", - "^static int[ \t]+size;", +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\ +s@ __VA_LIST__));@ __gnuc_va_list));@\n\ +s@ va_list@ __not_va_list__@\n\ +s@\\*va_list@*__not_va_list__@\n\ +s@ __va_list)@ __gnuc_va_list)@\n\ +s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\ +s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n\ +s@GNUC_VA_LIST@GNUC_Va_LIST@\n\ +s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n\ +s@_NEED___VA_LIST@_NEED___Va_LIST@\n\ +s@VA_LIST@DUMMY_VA_LIST@\n\ +s@_Va_LIST@_VA_LIST@", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sysv68_String fix + * Description of Stdio_Va_List_Clients fix */ -tSCC zSysv68_StringName[] = - "sysv68_string"; +tSCC zStdio_Va_List_ClientsName[] = + "stdio_va_list_clients"; /* * File name selection pattern */ -tSCC zSysv68_StringList[] = - "|testing.h|string.h|"; +tSCC zStdio_Va_List_ClientsList[] = + "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 */ -#define apzSysv68_StringMachs (const char**)NULL +#define apzStdio_Va_List_ClientsMachs (const char**)NULL /* * content bypass pattern - skip fix if pattern found */ -tSCC zSysv68_StringBypass0[] = - "_CLASSIC_ANSI_TYPES"; +tSCC zStdio_Va_List_ClientsBypass0[] = + "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list"; +tSCC zStdio_Va_List_ClientsBypass1[] = + "include |#ifdef va_start"; -#define SYSV68_STRING_TEST_CT 1 -static tTestDesc aSysv68_StringTests[] = { - { TT_NEGREP, zSysv68_StringBypass0, (regex_t*)NULL }, }; +#define STDIO_VA_LIST_CLIENTS_TEST_CT 2 +static tTestDesc aStdio_Va_List_ClientsTests[] = { + { TT_NEGREP, zStdio_Va_List_ClientsBypass0, (regex_t*)NULL }, + { TT_NEGREP, zStdio_Va_List_ClientsBypass1, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Sysv68_String + * Fix Command Arguments for Stdio_Va_List_Clients */ -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/", +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\ +s@ __VA_LIST__));@ __gnuc_va_list));@\n\ +s@ va_list@ __not_va_list__@\n\ +s@\\*va_list@*__not_va_list__@\n\ +s@ __va_list)@ __gnuc_va_list)@\n\ +s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\ +s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n\ +s@GNUC_VA_LIST@GNUC_Va_LIST@\n\ +s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n\ +s@_NEED___VA_LIST@_NEED___Va_LIST@\n\ +s@VA_LIST@DUMMY_VA_LIST@\n\ +s@_Va_LIST@_VA_LIST@", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sysz_Stdlib_For_Sun fix + * Description of Strict_Ansi_Not fix */ -tSCC zSysz_Stdlib_For_SunName[] = - "sysz_stdlib_for_sun"; +tSCC zStrict_Ansi_NotName[] = + "strict_ansi_not"; /* * File name selection pattern */ -tSCC zSysz_Stdlib_For_SunList[] = - "|stdlib.h|"; +#define zStrict_Ansi_NotList (char*)NULL /* * Machine/OS name selection pattern */ -#define apzSysz_Stdlib_For_SunMachs (const char**)NULL +#define apzStrict_Ansi_NotMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSysz_Stdlib_For_SunSelect0[] = - "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\("; +tSCC zStrict_Ansi_NotSelect0[] = + "^([ \t]*#[ \t]*if.*)(!__STDC__|__STDC__[ \t]*==[ \t]*0|__STDC__[ \t]*!=[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)"; /* * content bypass pattern - skip fix if pattern found */ -tSCC zSysz_Stdlib_For_SunBypass0[] = - "_CLASSIC_ANSI_TYPES"; +tSCC zStrict_Ansi_NotBypass0[] = + "GNU and MIPS C compilers define __STDC__ differently"; +tSCC zStrict_Ansi_NotBypass1[] = + "__SCO_VERSION__.*__STDC__ != 1"; -#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 }, }; +/* + * perform the C function call test + */ +tSCC zStrict_Ansi_NotFTst0[] = "stdc_0_in_system_headers"; + +#define STRICT_ANSI_NOT_TEST_CT 4 +static tTestDesc aStrict_Ansi_NotTests[] = { + { TT_FUNCTION, zStrict_Ansi_NotFTst0, 0 /* unused */ }, + { TT_NEGREP, zStrict_Ansi_NotBypass0, (regex_t*)NULL }, + { TT_NEGREP, zStrict_Ansi_NotBypass1, (regex_t*)NULL }, + { TT_EGREP, zStrict_Ansi_NotSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Sysz_Stdlib_For_Sun + * Fix Command Arguments for Strict_Ansi_Not */ -static const char* apzSysz_Stdlib_For_SunPatch[] = { +static const char* apzStrict_Ansi_NotPatch[] = { "format", - "void *\t%1(", + "%1 !defined(__STRICT_ANSI__)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Thread_Keyword fix + * Description of Strict_Ansi_Not_Ctd fix */ -tSCC zThread_KeywordName[] = - "thread_keyword"; +tSCC zStrict_Ansi_Not_CtdName[] = + "strict_ansi_not_ctd"; /* * File name selection pattern */ -tSCC zThread_KeywordList[] = - "|pthread.h|bits/sigthread.h|"; +tSCC zStrict_Ansi_Not_CtdList[] = + "math.h\0limits.h\0stdio.h\0signal.h\0stdlib.h\0sys/signal.h\0time.h\0"; /* * Machine/OS name selection pattern */ -#define apzThread_KeywordMachs (const char**)NULL +#define apzStrict_Ansi_Not_CtdMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zThread_KeywordSelect0[] = - "([* ])__thread([,)])"; +tSCC zStrict_Ansi_Not_CtdSelect0[] = + "^([ \t]*(\\(|&&|\\|\\|)([ \t(]*!*[ \t]*defined\\([a-zA-Z_0-9]+\\)[ \t]*[|&][|&])*[ \t(]*)(__STDC__[ \t]*(|-[ \t]*0[ \t]*)==[ \t]*0)"; -#define THREAD_KEYWORD_TEST_CT 1 -static tTestDesc aThread_KeywordTests[] = { - { TT_EGREP, zThread_KeywordSelect0, (regex_t*)NULL }, }; +/* + * perform the C function call test + */ +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 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)"; + +/* + * perform the C function call test + */ +tSCC zStrict_Ansi_OnlyFTst0[] = "stdc_0_in_system_headers"; -#define TINFO_CPLUSPLUS_TEST_CT 1 -static tTestDesc aTinfo_CplusplusTests[] = { - { TT_EGREP, zTinfo_CplusplusSelect0, (regex_t*)NULL }, }; +#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 }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -7674,7 +8052,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 */ @@ -7709,7 +8087,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 */ @@ -7751,7 +8129,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 */ @@ -7770,7 +8148,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\ @@ -7800,7 +8178,7 @@ tSCC zVxworks_Needs_VxtypesName[] = * File name selection pattern */ tSCC zVxworks_Needs_VxtypesList[] = - "|time.h|"; + "time.h\0"; /* * Machine/OS name selection pattern */ @@ -7835,7 +8213,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 */ @@ -7867,7 +8245,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 }; @@ -7883,7 +8261,7 @@ tSCC zVxworks_TimeName[] = * File name selection pattern */ tSCC zVxworks_TimeList[] = - "|time.h|"; + "time.h\0"; /* * Machine/OS name selection pattern */ @@ -7924,97 +8302,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[] = @@ -8024,7 +8311,7 @@ tSCC zX11_ClassName[] = * File name selection pattern */ tSCC zX11_ClassList[] = - "|X11/ShellP.h|"; + "X11/ShellP.h\0"; /* * Machine/OS name selection pattern */ @@ -8070,7 +8357,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 */ @@ -8112,7 +8399,7 @@ tSCC zX11_NewName[] = * File name selection pattern */ tSCC zX11_NewList[] = - "|Xm/Traversal.h|"; + "Xm/Traversal.h\0"; /* * Machine/OS name selection pattern */ @@ -8131,10 +8418,10 @@ 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\ +\\\tWidget\told, c_new;\\\n\ #else\n", "-e", "/Widget\told, new;/a\\\n\ #endif\n", @@ -8152,7 +8439,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 */ @@ -8183,14 +8470,15 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 243 -#define MACH_LIST_SIZE_LIMIT 261 -#define FIX_COUNT 201 +#define REGEX_COUNT 247 +#define MACH_LIST_SIZE_LIMIT 181 +#define FIX_COUNT 208 /* * 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, @@ -8198,13 +8486,14 @@ 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_COMPLEX_FIXIDX, AIX_PTHREAD_FIXIDX, + AIX_STDINT_1_FIXIDX, + AIX_STDINT_2_FIXIDX, + AIX_STDINT_3_FIXIDX, + AIX_STDINT_4_FIXIDX, + AIX_STDINT_5_FIXIDX, AIX_SYSMACHINE_FIXIDX, - AIX_SYSWAIT_FIXIDX, AIX_SYSWAIT_2_FIXIDX, AIX_VOLATILE_FIXIDX, ALPHA___ASSERT_FIXIDX, @@ -8214,12 +8503,12 @@ typedef enum { ALPHA_ASSERT_FIXIDX, ALPHA_BAD_LVAL_FIXIDX, ALPHA_GETOPT_FIXIDX, + ALPHA_IF_SEMICOLON_FIXIDX, ALPHA_PARENS_FIXIDX, ALPHA_PTHREAD_FIXIDX, ALPHA_PTHREAD_GCC_FIXIDX, ALPHA_PTHREAD_INIT_FIXIDX, ALPHA_SBRK_FIXIDX, - ALPHA_WCHAR_FIXIDX, AVOID_BOOL_DEFINE_FIXIDX, AVOID_BOOL_TYPE_FIXIDX, AVOID_WCHAR_T_TYPE_FIXIDX, @@ -8233,18 +8522,34 @@ typedef enum { CTRL_QUOTES_DEF_FIXIDX, CTRL_QUOTES_USE_FIXIDX, CXX_UNREADY_FIXIDX, + DARWIN_EXTERNC_FIXIDX, DARWIN_GCC4_BREAKAGE_FIXIDX, DARWIN_PRIVATE_EXTERN_FIXIDX, + DARWIN_STDINT_1_FIXIDX, + DARWIN_STDINT_2_FIXIDX, + DARWIN_STDINT_3_FIXIDX, + DARWIN_STDINT_4_FIXIDX, + DARWIN_STDINT_5_FIXIDX, + DARWIN_STDINT_6_FIXIDX, + DARWIN_STDINT_7_FIXIDX, DEC_INTERN_ASM_FIXIDX, DJGPP_WCHAR_H_FIXIDX, ECD_CURSOR_FIXIDX, - 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, + GLIBC_STDINT_FIXIDX, + GLIBC_STRNCPY_FIXIDX, + GLIBC_TGMATH_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, @@ -8252,18 +8557,27 @@ 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, HPUX11_VSNPRINTF_FIXIDX, HPUX8_BOGUS_INLINES_FIXIDX, HPUX_CTYPE_MACROS_FIXIDX, HPUX_HTONL_FIXIDX, HPUX_LONG_DOUBLE_FIXIDX, + HPUX_LONG_DOUBLE_2_FIXIDX, HPUX_SYSTIME_FIXIDX, HPUX_SPU_INFO_FIXIDX, + HPUX11_EXTERN_SENDFILE_FIXIDX, + HPUX11_EXTERN_SENDPATH_FIXIDX, HPUX_EXTERN_ERRNO_FIXIDX, HPUX_PTHREAD_INITIALIZERS_FIXIDX, + HPUX_C99_INTPTR_FIXIDX, + HPUX_C99_INTTYPES_FIXIDX, + HPUX_C99_INTTYPES2_FIXIDX, + HPUX_STDINT_LEAST_FAST_FIXIDX, + HPUX_INTTYPE_INT8_T_FIXIDX, + HPUX_IMAGINARY_I_FIXIDX, HUGE_VAL_HEX_FIXIDX, HUGE_VALF_HEX_FIXIDX, HUGE_VALL_HEX_FIXIDX, @@ -8275,15 +8589,15 @@ typedef enum { IRIX___GENERIC1_FIXIDX, IRIX___GENERIC2_FIXIDX, IRIX_ASM_APOSTROPHE_FIXIDX, + IRIX_COMPLEX_FIXIDX, IRIX_LIMITS_CONST_FIXIDX, IRIX_SOCKLEN_T_FIXIDX, + IRIX_STDINT_C99_MODE_FIXIDX, + IRIX_STDINT_C99_TYPES_FIXIDX, + IRIX_STDINT_C99_MACROS_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, @@ -8292,18 +8606,21 @@ 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, + NEWLIB_STDINT_1_FIXIDX, + NEWLIB_STDINT_2_FIXIDX, NEXT_MATH_PREFIX_FIXIDX, NEXT_TEMPLATE_FIXIDX, NEXT_VOLITILE_FIXIDX, NEXT_WAIT_UNION_FIXIDX, NODEENT_SYNTAX_FIXIDX, + OPENBSD_NULL_DEFINITION_FIXIDX, OBSTACK_LVALUE_CAST_FIXIDX, + OPENBSD_VA_START_FIXIDX, OSF_NAMESPACE_A_FIXIDX, OSF_NAMESPACE_C_FIXIDX, - PTHREAD_PAGE_SIZE_FIXIDX, PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_FIXIDX, READ_RET_TYPE_FIXIDX, RPC_XDR_LVALUE_CAST_A_FIXIDX, @@ -8311,28 +8628,27 @@ typedef enum { RS6000_DOUBLE_FIXIDX, RS6000_FCHMOD_FIXIDX, RS6000_PARAM_FIXIDX, - SCO_MATH_FIXIDX, - SCO_REGSET_FIXIDX, - SCO_STATIC_FUNC_FIXIDX, - SCO_UTIME_FIXIDX, + SOLARIS___RESTRICT_FIXIDX, + SOLARIS_COMPLEX_FIXIDX, + SOLARIS_COMPLEX_CXX_FIXIDX, + SOLARIS_COND_INIT_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_ONCE_INIT_2_FIXIDX, - SOLARIS_SOCKET_FIXIDX, + SOLARIS_INT_CONST_FIXIDX, + SOLARIS_INT_LIMITS_1_FIXIDX, + SOLARIS_INT_LIMITS_2_FIXIDX, + SOLARIS_INT_LIMITS_3_FIXIDX, + SOLARIS_INT_TYPES_FIXIDX, SOLARIS_STDIO_TAG_FIXIDX, - SOLARIS_UNISTD_FIXIDX, - SOLARIS_WIDEC_FIXIDX, STATSSWTCH_FIXIDX, STDIO_STDARG_H_FIXIDX, STDIO_VA_LIST_FIXIDX, @@ -8351,7 +8667,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, @@ -8359,35 +8674,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, @@ -8395,6 +8689,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, @@ -8430,41 +8729,46 @@ 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_ComplexName, zAix_ComplexList, + apzAix_ComplexMachs, + AIX_COMPLEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_ComplexTests, apzAix_ComplexPatch, 0 }, { zAix_PthreadName, zAix_PthreadList, apzAix_PthreadMachs, AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAix_PthreadTests, apzAix_PthreadPatch, 0 }, + { zAix_Stdint_1Name, zAix_Stdint_1List, + apzAix_Stdint_1Machs, + AIX_STDINT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdint_1Tests, apzAix_Stdint_1Patch, 0 }, + + { zAix_Stdint_2Name, zAix_Stdint_2List, + apzAix_Stdint_2Machs, + AIX_STDINT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdint_2Tests, apzAix_Stdint_2Patch, 0 }, + + { zAix_Stdint_3Name, zAix_Stdint_3List, + apzAix_Stdint_3Machs, + AIX_STDINT_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdint_3Tests, apzAix_Stdint_3Patch, 0 }, + + { zAix_Stdint_4Name, zAix_Stdint_4List, + apzAix_Stdint_4Machs, + AIX_STDINT_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdint_4Tests, apzAix_Stdint_4Patch, 0 }, + + { zAix_Stdint_5Name, zAix_Stdint_5List, + apzAix_Stdint_5Machs, + AIX_STDINT_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdint_5Tests, apzAix_Stdint_5Patch, 0 }, + { zAix_SysmachineName, zAix_SysmachineList, apzAix_SysmachineMachs, AIX_SYSMACHINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAix_SysmachineTests, apzAix_SysmachinePatch, 0 }, - { zAix_SyswaitName, zAix_SyswaitList, - apzAix_SyswaitMachs, - AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aAix_SyswaitTests, apzAix_SyswaitPatch, 0 }, - { zAix_Syswait_2Name, zAix_Syswait_2List, apzAix_Syswait_2Machs, AIX_SYSWAIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8510,6 +8814,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ALPHA_GETOPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAlpha_GetoptTests, apzAlpha_GetoptPatch, 0 }, + { zAlpha_If_SemicolonName, zAlpha_If_SemicolonList, + apzAlpha_If_SemicolonMachs, + ALPHA_IF_SEMICOLON_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAlpha_If_SemicolonTests, apzAlpha_If_SemicolonPatch, 0 }, + { zAlpha_ParensName, zAlpha_ParensList, apzAlpha_ParensMachs, ALPHA_PARENS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8535,11 +8844,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAlpha_SbrkTests, apzAlpha_SbrkPatch, 0 }, - { zAlpha_WcharName, zAlpha_WcharList, - apzAlpha_WcharMachs, - ALPHA_WCHAR_TEST_CT, FD_MACH_ONLY, - aAlpha_WcharTests, apzAlpha_WcharPatch, 0 }, - { zAvoid_Bool_DefineName, zAvoid_Bool_DefineList, apzAvoid_Bool_DefineMachs, AVOID_BOOL_DEFINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8577,7 +8881,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, @@ -8605,6 +8909,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, @@ -8615,6 +8924,41 @@ tFixDesc fixDescList[ FIX_COUNT ] = { DARWIN_PRIVATE_EXTERN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aDarwin_Private_ExternTests, apzDarwin_Private_ExternPatch, 0 }, + { zDarwin_Stdint_1Name, zDarwin_Stdint_1List, + apzDarwin_Stdint_1Machs, + DARWIN_STDINT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_1Tests, apzDarwin_Stdint_1Patch, 0 }, + + { zDarwin_Stdint_2Name, zDarwin_Stdint_2List, + apzDarwin_Stdint_2Machs, + DARWIN_STDINT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_2Tests, apzDarwin_Stdint_2Patch, 0 }, + + { zDarwin_Stdint_3Name, zDarwin_Stdint_3List, + apzDarwin_Stdint_3Machs, + DARWIN_STDINT_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_3Tests, apzDarwin_Stdint_3Patch, 0 }, + + { zDarwin_Stdint_4Name, zDarwin_Stdint_4List, + apzDarwin_Stdint_4Machs, + DARWIN_STDINT_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_4Tests, apzDarwin_Stdint_4Patch, 0 }, + + { zDarwin_Stdint_5Name, zDarwin_Stdint_5List, + apzDarwin_Stdint_5Machs, + DARWIN_STDINT_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_5Tests, apzDarwin_Stdint_5Patch, 0 }, + + { zDarwin_Stdint_6Name, zDarwin_Stdint_6List, + apzDarwin_Stdint_6Machs, + DARWIN_STDINT_6_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_6Tests, apzDarwin_Stdint_6Patch, 0 }, + + { zDarwin_Stdint_7Name, zDarwin_Stdint_7List, + apzDarwin_Stdint_7Machs, + DARWIN_STDINT_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_7Tests, apzDarwin_Stdint_7Patch, 0 }, + { zDec_Intern_AsmName, zDec_Intern_AsmList, apzDec_Intern_AsmMachs, DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY, @@ -8630,11 +8974,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ECD_CURSOR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aEcd_CursorTests, apzEcd_CursorPatch, 0 }, - { zException_StructureName, zException_StructureList, - apzException_StructureMachs, - EXCEPTION_STRUCTURE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aException_StructureTests, apzException_StructurePatch, 0 }, - { zFreebsd_Gcc3_BreakageName, zFreebsd_Gcc3_BreakageList, apzFreebsd_Gcc3_BreakageMachs, FREEBSD_GCC3_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8645,11 +8984,51 @@ 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 }, + { zGlibc_StdintName, zGlibc_StdintList, + apzGlibc_StdintMachs, + GLIBC_STDINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aGlibc_StdintTests, apzGlibc_StdintPatch, 0 }, + + { zGlibc_StrncpyName, zGlibc_StrncpyList, + apzGlibc_StrncpyMachs, + GLIBC_STRNCPY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aGlibc_StrncpyTests, apzGlibc_StrncpyPatch, 0 }, + + { zGlibc_TgmathName, zGlibc_TgmathList, + apzGlibc_TgmathMachs, + GLIBC_TGMATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aGlibc_TgmathTests, apzGlibc_TgmathPatch, 0 }, + { zGnu_TypesName, zGnu_TypesList, apzGnu_TypesMachs, GNU_TYPES_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE, @@ -8665,6 +9044,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, @@ -8700,6 +9084,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, @@ -8710,11 +9099,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX11_SNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux11_SnprintfTests, apzHpux11_SnprintfPatch, 0 }, - { zHpux11_Uint32_CName, zHpux11_Uint32_CList, - apzHpux11_Uint32_CMachs, - HPUX11_UINT32_C_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aHpux11_Uint32_CTests, apzHpux11_Uint32_CPatch, 0 }, - { zHpux11_VsnprintfName, zHpux11_VsnprintfList, apzHpux11_VsnprintfMachs, HPUX11_VSNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8740,6 +9124,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY, aHpux_Long_DoubleTests, apzHpux_Long_DoublePatch, 0 }, + { zHpux_Long_Double_2Name, zHpux_Long_Double_2List, + apzHpux_Long_Double_2Machs, + HPUX_LONG_DOUBLE_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_Long_Double_2Tests, apzHpux_Long_Double_2Patch, 0 }, + { zHpux_SystimeName, zHpux_SystimeList, apzHpux_SystimeMachs, HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8750,6 +9139,16 @@ 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, @@ -8760,6 +9159,36 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX_PTHREAD_INITIALIZERS_TEST_CT, FD_MACH_ONLY, aHpux_Pthread_InitializersTests, apzHpux_Pthread_InitializersPatch, 0 }, + { zHpux_C99_IntptrName, zHpux_C99_IntptrList, + apzHpux_C99_IntptrMachs, + HPUX_C99_INTPTR_TEST_CT, FD_MACH_ONLY, + aHpux_C99_IntptrTests, apzHpux_C99_IntptrPatch, 0 }, + + { zHpux_C99_InttypesName, zHpux_C99_InttypesList, + apzHpux_C99_InttypesMachs, + HPUX_C99_INTTYPES_TEST_CT, FD_MACH_ONLY, + aHpux_C99_InttypesTests, apzHpux_C99_InttypesPatch, 0 }, + + { zHpux_C99_Inttypes2Name, zHpux_C99_Inttypes2List, + apzHpux_C99_Inttypes2Machs, + HPUX_C99_INTTYPES2_TEST_CT, FD_MACH_ONLY, + aHpux_C99_Inttypes2Tests, apzHpux_C99_Inttypes2Patch, 0 }, + + { zHpux_Stdint_Least_FastName, zHpux_Stdint_Least_FastList, + apzHpux_Stdint_Least_FastMachs, + HPUX_STDINT_LEAST_FAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_Stdint_Least_FastTests, apzHpux_Stdint_Least_FastPatch, 0 }, + + { zHpux_Inttype_Int8_TName, zHpux_Inttype_Int8_TList, + apzHpux_Inttype_Int8_TMachs, + HPUX_INTTYPE_INT8_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_Inttype_Int8_TTests, apzHpux_Inttype_Int8_TPatch, 0 }, + + { zHpux_Imaginary_IName, zHpux_Imaginary_IList, + apzHpux_Imaginary_IMachs, + HPUX_IMAGINARY_I_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_Imaginary_ITests, apzHpux_Imaginary_IPatch, 0 }, + { zHuge_Val_HexName, zHuge_Val_HexList, apzHuge_Val_HexMachs, HUGE_VAL_HEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8815,6 +9244,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aIrix_Asm_ApostropheTests, apzIrix_Asm_ApostrophePatch, 0 }, + { zIrix_ComplexName, zIrix_ComplexList, + apzIrix_ComplexMachs, + IRIX_COMPLEX_TEST_CT, FD_MACH_ONLY, + aIrix_ComplexTests, apzIrix_ComplexPatch, 0 }, + { zIrix_Limits_ConstName, zIrix_Limits_ConstList, apzIrix_Limits_ConstMachs, IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8825,6 +9259,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = { IRIX_SOCKLEN_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aIrix_Socklen_TTests, apzIrix_Socklen_TPatch, 0 }, + { zIrix_Stdint_C99_ModeName, zIrix_Stdint_C99_ModeList, + apzIrix_Stdint_C99_ModeMachs, + IRIX_STDINT_C99_MODE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aIrix_Stdint_C99_ModeTests, apzIrix_Stdint_C99_ModePatch, 0 }, + + { zIrix_Stdint_C99_TypesName, zIrix_Stdint_C99_TypesList, + apzIrix_Stdint_C99_TypesMachs, + IRIX_STDINT_C99_TYPES_TEST_CT, FD_MACH_ONLY, + aIrix_Stdint_C99_TypesTests, apzIrix_Stdint_C99_TypesPatch, 0 }, + + { zIrix_Stdint_C99_MacrosName, zIrix_Stdint_C99_MacrosList, + apzIrix_Stdint_C99_MacrosMachs, + IRIX_STDINT_C99_MACROS_TEST_CT, FD_MACH_ONLY, + aIrix_Stdint_C99_MacrosTests, apzIrix_Stdint_C99_MacrosPatch, 0 }, + { zIrix_Stdio_Va_ListName, zIrix_Stdio_Va_ListList, apzIrix_Stdio_Va_ListMachs, IRIX_STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8835,31 +9284,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { IRIX_WCSFTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aIrix_WcsftimeTests, apzIrix_WcsftimePatch, 0 }, - { zIsc_FmodName, zIsc_FmodList, - apzIsc_FmodMachs, - ISC_FMOD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aIsc_FmodTests, apzIsc_FmodPatch, 0 }, - - { zIsc_Omits_With_StdcName, zIsc_Omits_With_StdcList, - apzIsc_Omits_With_StdcMachs, - ISC_OMITS_WITH_STDC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aIsc_Omits_With_StdcTests, apzIsc_Omits_With_StdcPatch, 0 }, - { zKandr_ConcatName, zKandr_ConcatList, apzKandr_ConcatMachs, 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, @@ -8900,21 +9329,31 @@ 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 }, + { 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 }, - { 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_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, aNetbsd_Extra_SemicolonTests, apzNetbsd_Extra_SemicolonPatch, 0 }, + { zNewlib_Stdint_1Name, zNewlib_Stdint_1List, + apzNewlib_Stdint_1Machs, + NEWLIB_STDINT_1_TEST_CT, FD_MACH_ONLY, + aNewlib_Stdint_1Tests, apzNewlib_Stdint_1Patch, 0 }, + + { zNewlib_Stdint_2Name, zNewlib_Stdint_2List, + apzNewlib_Stdint_2Machs, + NEWLIB_STDINT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aNewlib_Stdint_2Tests, apzNewlib_Stdint_2Patch, 0 }, + { zNext_Math_PrefixName, zNext_Math_PrefixList, apzNext_Math_PrefixMachs, NEXT_MATH_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8940,11 +9379,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = { NODEENT_SYNTAX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aNodeent_SyntaxTests, apzNodeent_SyntaxPatch, 0 }, + { zOpenbsd_Null_DefinitionName, zOpenbsd_Null_DefinitionList, + apzOpenbsd_Null_DefinitionMachs, + OPENBSD_NULL_DEFINITION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aOpenbsd_Null_DefinitionTests, apzOpenbsd_Null_DefinitionPatch, 0 }, + { zObstack_Lvalue_CastName, zObstack_Lvalue_CastList, apzObstack_Lvalue_CastMachs, OBSTACK_LVALUE_CAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aObstack_Lvalue_CastTests, apzObstack_Lvalue_CastPatch, 0 }, + { zOpenbsd_Va_StartName, zOpenbsd_Va_StartList, + apzOpenbsd_Va_StartMachs, + OPENBSD_VA_START_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aOpenbsd_Va_StartTests, apzOpenbsd_Va_StartPatch, 0 }, + { zOsf_Namespace_AName, zOsf_Namespace_AList, apzOsf_Namespace_AMachs, OSF_NAMESPACE_A_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8955,11 +9404,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { OSF_NAMESPACE_C_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aOsf_Namespace_CTests, apzOsf_Namespace_CPatch, 0 }, - { zPthread_Page_SizeName, zPthread_Page_SizeList, - apzPthread_Page_SizeMachs, - PTHREAD_PAGE_SIZE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aPthread_Page_SizeTests, apzPthread_Page_SizePatch, 0 }, - { zPthread_Incomplete_Struct_ArgumentName, zPthread_Incomplete_Struct_ArgumentList, apzPthread_Incomplete_Struct_ArgumentMachs, PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8995,25 +9439,25 @@ tFixDesc fixDescList[ FIX_COUNT ] = { RS6000_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aRs6000_ParamTests, apzRs6000_ParamPatch, 0 }, - { zSco_MathName, zSco_MathList, - apzSco_MathMachs, - SCO_MATH_TEST_CT, FD_MACH_ONLY, - aSco_MathTests, apzSco_MathPatch, 0 }, + { zSolaris___RestrictName, zSolaris___RestrictList, + apzSolaris___RestrictMachs, + SOLARIS___RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris___RestrictTests, apzSolaris___RestrictPatch, 0 }, - { zSco_RegsetName, zSco_RegsetList, - apzSco_RegsetMachs, - SCO_REGSET_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aSco_RegsetTests, apzSco_RegsetPatch, 0 }, + { zSolaris_ComplexName, zSolaris_ComplexList, + apzSolaris_ComplexMachs, + SOLARIS_COMPLEX_TEST_CT, FD_MACH_ONLY, + aSolaris_ComplexTests, apzSolaris_ComplexPatch, 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 }, + { zSolaris_Complex_CxxName, zSolaris_Complex_CxxList, + apzSolaris_Complex_CxxMachs, + SOLARIS_COMPLEX_CXX_TEST_CT, FD_MACH_ONLY, + aSolaris_Complex_CxxTests, apzSolaris_Complex_CxxPatch, 0 }, - { zSco_UtimeName, zSco_UtimeList, - apzSco_UtimeMachs, - SCO_UTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aSco_UtimeTests, apzSco_UtimePatch, 0 }, + { zSolaris_Cond_InitName, zSolaris_Cond_InitList, + apzSolaris_Cond_InitMachs, + SOLARIS_COND_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Cond_InitTests, apzSolaris_Cond_InitPatch, 0 }, { zSolaris_Math_1Name, zSolaris_Math_1List, apzSolaris_Math_1Machs, @@ -9035,21 +9479,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, @@ -9060,10 +9489,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, @@ -9085,26 +9514,36 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SOLARIS_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSolaris_Once_Init_2Tests, apzSolaris_Once_Init_2Patch, 0 }, - { zSolaris_SocketName, zSolaris_SocketList, - apzSolaris_SocketMachs, - SOLARIS_SOCKET_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aSolaris_SocketTests, apzSolaris_SocketPatch, 0 }, + { zSolaris_Int_ConstName, zSolaris_Int_ConstList, + apzSolaris_Int_ConstMachs, + SOLARIS_INT_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Int_ConstTests, apzSolaris_Int_ConstPatch, 0 }, + + { zSolaris_Int_Limits_1Name, zSolaris_Int_Limits_1List, + apzSolaris_Int_Limits_1Machs, + SOLARIS_INT_LIMITS_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Int_Limits_1Tests, apzSolaris_Int_Limits_1Patch, 0 }, + + { zSolaris_Int_Limits_2Name, zSolaris_Int_Limits_2List, + apzSolaris_Int_Limits_2Machs, + SOLARIS_INT_LIMITS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Int_Limits_2Tests, apzSolaris_Int_Limits_2Patch, 0 }, + + { zSolaris_Int_Limits_3Name, zSolaris_Int_Limits_3List, + apzSolaris_Int_Limits_3Machs, + SOLARIS_INT_LIMITS_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Int_Limits_3Tests, apzSolaris_Int_Limits_3Patch, 0 }, + + { zSolaris_Int_TypesName, zSolaris_Int_TypesList, + apzSolaris_Int_TypesMachs, + SOLARIS_INT_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Int_TypesTests, apzSolaris_Int_TypesPatch, 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, @@ -9195,11 +9634,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, @@ -9235,16 +9669,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, @@ -9255,86 +9679,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, @@ -9365,21 +9709,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,