OSDN Git Service

regenerate
[pf3gnuchains/gcc-fork.git] / gcc / fixinc / fixincl.x
index 524489b..526e599 100644 (file)
@@ -5,14 +5,14 @@
  * files which are fixed to work correctly with ANSI C and placed in a
  * directory that GNU C will search.
  *
- * This file contains 130 fixup descriptions.
+ * This file contains 139 fixup descriptions.
  *
- * See README-fixinc for more information.
+ * See README for more information.
  *
- *  inclhack copyright (c) 1998, 1999, 2000
+ *  inclhack copyright (c) 1998, 1999, 2000, 2001
  *  The Free Software Foundation, Inc.
  *
- *  inclhack is free software.
 *  inclhack is free software.
  *  
  *  You may redistribute it and/or modify it under the terms of the
  *  GNU General Public License, as published by the Free Software
@@ -168,9 +168,43 @@ static const char* apzAaa_Ki_DefsPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Aaa_Standards fix
+ */
+#define AAA_STANDARDS_FIXIDX             4
+tSCC zAaa_StandardsName[] =
+     "AAA_standards";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAaa_StandardsList[] =
+  "|standards.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAaa_StandardsMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAaa_StandardsSelect0[] =
+       "GNU and MIPS C compilers define __STDC__ differently";
+
+#define    AAA_STANDARDS_TEST_CT  1
+static tTestDesc aAaa_StandardsTests[] = {
+  { TT_EGREP,    zAaa_StandardsSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aaa_Standards
+ */
+static const char* apzAaa_StandardsPatch[] = {
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Aaa_Bad_Fixes fix
  */
-#define AAA_BAD_FIXES_FIXIDX             4
+#define AAA_BAD_FIXES_FIXIDX             5
 tSCC zAaa_Bad_FixesName[] =
      "AAA_bad_fixes";
 
@@ -196,7 +230,7 @@ static const char* apzAaa_Bad_FixesPatch[] = {
  *
  *  Description of Aaa_Time fix
  */
-#define AAA_TIME_FIXIDX                  5
+#define AAA_TIME_FIXIDX                  6
 tSCC zAaa_TimeName[] =
      "AAA_time";
 
@@ -230,7 +264,7 @@ static const char* apzAaa_TimePatch[] = {
  *
  *  Description of Aab_Dgux_Int_Varargs fix
  */
-#define AAB_DGUX_INT_VARARGS_FIXIDX      6
+#define AAB_DGUX_INT_VARARGS_FIXIDX      7
 tSCC zAab_Dgux_Int_VarargsName[] =
      "AAB_dgux_int_varargs";
 
@@ -251,64 +285,48 @@ tSCC zAab_Dgux_Int_VarargsList[] =
  */
 static const char* apzAab_Dgux_Int_VarargsPatch[] = {
 "#ifndef __INT_VARARGS_H\n\
-#define __INT_VARARGS_H\n\
-\n\
+#define __INT_VARARGS_H\n\n\
 /************************************************************************/\n\
 /* _INT_VARARGS.H - Define the common stuff for varargs/stdarg/stdio.   */\n\
-/************************************************************************/\n\
-\n\
+/************************************************************************/\n\n\
 /*\n\
 ** This file is a DG internal header.  Never include this\n\
 ** file directly.\n\
-*/\n\
-\n\
+*/\n\n\
 #ifndef ___int_features_h\n\
-#include <sys/_int_features.h>\n\
-#endif\n\
-\n\
+#include <sys/_int_features.h>\n\
+#endif\n\n\
 #if !(defined(_VA_LIST) || defined(_VA_LIST_))\n\
 #define _VA_LIST\n\
-#define _VA_LIST_\n\
-\n\
-#ifdef __LINT__\n\
-\n\
+#define _VA_LIST_\n\n\
+#ifdef __LINT__\n\n\
 #ifdef __STDC__\n\
 typedef void * va_list;\n\
 #else\n\
 typedef char * va_list;\n\
-#endif\n\
-\n\
+#endif\n\n\
 #else\n\
-#if _M88K_ANY\n\
-\n\
-#if defined(__DCC__)\n\
-\n\
+#if _M88K_ANY\n\n\
+#if defined(__DCC__)\n\n\
 typedef struct {\n\
       int     next_arg;\n\
       int     *mem_ptr;\n\
       int     *reg_ptr;\n\
-} va_list;\n\
-\n\
-#else  /* ! defined(__DCC__) */\n\
-\n\
+} va_list;\n\n\
+#else  /* ! defined(__DCC__) */\n\n\
 typedef struct {\n\
       int  __va_arg;       /* argument number */\n\
       int *__va_stk;       /* start of args passed on stack */\n\
       int *__va_reg;       /* start of args passed in regs */\n\
-} va_list;\n\
-\n\
-#endif  /* ! defined(__DCC__) */\n\
-\n\
-#elif _IX86_ANY\n\
-\n\
+} va_list;\n\n\
+#endif  /* ! defined(__DCC__) */\n\n\
+#elif _IX86_ANY\n\n\
 #if defined(__GNUC__) || defined(__STDC__)\n\
 typedef void * va_list;\n\
 #else\n\
 typedef char * va_list;\n\
-#endif\n\
-\n\
-#endif  /*  _IX86_ANY */\n\
-\n\
+#endif\n\n\
+#endif  /*  _IX86_ANY */\n\n\
 #endif /* __LINT__ */\n\
 #endif /*  !(defined(_VA_LIST) || defined(_VA_LIST_)) */\n\
 #endif /*  #ifndef __INT_VARARGS_H  */\n",
@@ -318,7 +336,7 @@ typedef char * va_list;\n\
  *
  *  Description of Aab_Fd_Zero_Asm_Posix_Types_H fix
  */
-#define AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX 7
+#define AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX 8
 tSCC zAab_Fd_Zero_Asm_Posix_Types_HName[] =
      "AAB_fd_zero_asm_posix_types_h";
 
@@ -352,8 +370,7 @@ static const char* apzAab_Fd_Zero_Asm_Posix_Types_HPatch[] = {
    for older versions of the Linux kernel. */\n\
 #ifndef _POSIX_TYPES_H_WRAPPER\n\
 #include <features.h>\n\
- #include_next <asm/posix_types.h>\n\
-\n\
+ #include_next <asm/posix_types.h>\n\n\
 #if defined(__FD_ZERO) && !defined(__GLIBC__)\n\
 #undef __FD_ZERO\n\
 #define __FD_ZERO(fdsetp) \\\n\
@@ -364,8 +381,7 @@ static const char* apzAab_Fd_Zero_Asm_Posix_Types_HPatch[] = {
 \t\t\t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\
 \t\t\t  \"1\" ((__kernel_fd_set *) (fdsetp)) :\"memory\"); \\\n\
   } while (0)\n\
-#endif\n\
-\n\
+#endif\n\n\
 #define _POSIX_TYPES_H_WRAPPER\n\
 #endif /* _POSIX_TYPES_H_WRAPPER */\n",
     (char*)NULL };
@@ -374,7 +390,7 @@ static const char* apzAab_Fd_Zero_Asm_Posix_Types_HPatch[] = {
  *
  *  Description of Aab_Fd_Zero_Gnu_Types_H fix
  */
-#define AAB_FD_ZERO_GNU_TYPES_H_FIXIDX   8
+#define AAB_FD_ZERO_GNU_TYPES_H_FIXIDX   9
 tSCC zAab_Fd_Zero_Gnu_Types_HName[] =
      "AAB_fd_zero_gnu_types_h";
 
@@ -399,8 +415,7 @@ static const char* apzAab_Fd_Zero_Gnu_Types_HPatch[] = {
 "/* This file fixes a bug in the __FD_ZERO macro present in glibc 1.x. */\n\
 #ifndef _TYPES_H_WRAPPER\n\
 #include <features.h>\n\
- #include_next <gnu/types.h>\n\
-\n\
+ #include_next <gnu/types.h>\n\n\
 #if defined(__FD_ZERO) && !defined(__GLIBC__)\n\
 #undef __FD_ZERO\n\
 # define __FD_ZERO(fdsetp) \\\n\
@@ -411,8 +426,7 @@ static const char* apzAab_Fd_Zero_Gnu_Types_HPatch[] = {
         \t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\
 \t\t  \"1\" ((__fd_set *) (fdsetp)) :\"memory\"); \\\n\
   } while (0)\n\
-#endif\n\
-\n\
+#endif\n\n\
 #define _TYPES_H_WRAPPER\n\
 #endif /* _TYPES_H_WRAPPER */\n",
     (char*)NULL };
@@ -421,7 +435,7 @@ static const char* apzAab_Fd_Zero_Gnu_Types_HPatch[] = {
  *
  *  Description of Aab_Fd_Zero_Selectbits_H fix
  */
-#define AAB_FD_ZERO_SELECTBITS_H_FIXIDX  9
+#define AAB_FD_ZERO_SELECTBITS_H_FIXIDX  10
 tSCC zAab_Fd_Zero_Selectbits_HName[] =
      "AAB_fd_zero_selectbits_h";
 
@@ -446,8 +460,7 @@ static const char* apzAab_Fd_Zero_Selectbits_HPatch[] = {
 "/* This file fixes a bug in the __FD_ZERO macro present in glibc 2.0.x. */\n\
 #ifndef _SELECTBITS_H_WRAPPER\n\
 #include <features.h>\n\
- #include_next <selectbits.h>\n\
-\n\
+ #include_next <selectbits.h>\n\n\
 #if defined(__FD_ZERO) && defined(__GLIBC__) \\\n\
 \t&& defined(__GLIBC_MINOR__) && __GLIBC__ == 2 \\\n\
 \t&& __GLIBC_MINOR__ == 0\n\
@@ -462,8 +475,7 @@ static const char* apzAab_Fd_Zero_Selectbits_HPatch[] = {
                           \"1\" ((__fd_mask *) (fdsetp)) \\\n\
                         : \"memory\"); \\\n\
   } while (0)\n\
-#endif\n\
-\n\
+#endif\n\n\
 #define _SELECTBITS_H_WRAPPER\n\
 #endif /* _SELECTBITS_H_WRAPPER */\n",
     (char*)NULL };
@@ -472,7 +484,7 @@ static const char* apzAab_Fd_Zero_Selectbits_HPatch[] = {
  *
  *  Description of Aab_Sun_Memcpy fix
  */
-#define AAB_SUN_MEMCPY_FIXIDX            10
+#define AAB_SUN_MEMCPY_FIXIDX            11
 tSCC zAab_Sun_MemcpyName[] =
      "AAB_sun_memcpy";
 
@@ -502,8 +514,7 @@ static tTestDesc aAab_Sun_MemcpyTests[] = {
 static const char* apzAab_Sun_MemcpyPatch[] = {
 "/* This file was generated by fixincludes */\n\
 #ifndef __memory_h__\n\
-#define __memory_h__\n\
-\n\
+#define __memory_h__\n\n\
 #ifdef __STDC__\n\
 extern void *memccpy();\n\
 extern void *memchr();\n\
@@ -514,10 +525,8 @@ extern char *memccpy();\n\
 extern char *memchr();\n\
 extern char *memcpy();\n\
 extern char *memset();\n\
-#endif /* __STDC__ */\n\
-\n\
-extern int memcmp();\n\
-\n\
+#endif /* __STDC__ */\n\n\
+extern int memcmp();\n\n\
 #endif /* __memory_h__ */\n",
     (char*)NULL };
 
@@ -525,7 +534,7 @@ extern int memcmp();\n\
  *
  *  Description of Aab_Svr4_Replace_Byteorder fix
  */
-#define AAB_SVR4_REPLACE_BYTEORDER_FIXIDX 11
+#define AAB_SVR4_REPLACE_BYTEORDER_FIXIDX 12
 tSCC zAab_Svr4_Replace_ByteorderName[] =
      "AAB_svr4_replace_byteorder";
 
@@ -553,142 +562,106 @@ tSCC* apzAab_Svr4_Replace_ByteorderMachs[] = {
  */
 static const char* apzAab_Svr4_Replace_ByteorderPatch[] = {
 "#ifndef _SYS_BYTEORDER_H\n\
-#define _SYS_BYTEORDER_H\n\
-\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\
+   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\
+   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\
+#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\
+#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\
+#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\
+#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\
+  register unsigned long __result;\n\n\
   __asm__ (\"xchg%B0 %b0,%h0\n\
 \tror%L0 $16,%0\n\
 \txchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\
   return __result;\n\
-}\n\
-\n\
-/* Convert a host short to a network short.  */\n\
-\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\
+  register unsigned short __result;\n\n\
   __asm__ (\"xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\
   return __result;\n\
-}\n\
-\n\
+}\n\n\
 #elif ((defined (__i860__) && !defined (__i860_big_endian__))\t\\\n\
        || defined (__ns32k__) || defined (__vax__)\t\t\\\n\
-       || defined (__spur__) || defined (__arm__))\n\
-\n\
+       || defined (__spur__) || defined (__arm__))\n\n\
 #ifndef __BYTE_ORDER__\n\
 #define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\
-#endif\n\
-\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\
+   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\
+  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\
+}\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\
+  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\
+}\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\
+#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\
+}\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\
+}\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\
+}\n\n\
+/* Convert a network short to a host short.  */\n\n\
 static __inline__ unsigned short\n\
 ntohs (unsigned int __arg)\n\
 {\n\
@@ -701,7 +674,7 @@ ntohs (unsigned int __arg)\n\
  *
  *  Description of Aab_Ultrix_Ansi_Compat fix
  */
-#define AAB_ULTRIX_ANSI_COMPAT_FIXIDX    12
+#define AAB_ULTRIX_ANSI_COMPAT_FIXIDX    13
 tSCC zAab_Ultrix_Ansi_CompatName[] =
      "AAB_ultrix_ansi_compat";
 
@@ -736,7 +709,7 @@ static const char* apzAab_Ultrix_Ansi_CompatPatch[] = {
  *
  *  Description of Aab_Ultrix_Limits fix
  */
-#define AAB_ULTRIX_LIMITS_FIXIDX         13
+#define AAB_ULTRIX_LIMITS_FIXIDX         14
 tSCC zAab_Ultrix_LimitsName[] =
      "AAB_ultrix_limits";
 
@@ -758,9 +731,7 @@ tSCC* apzAab_Ultrix_LimitsMachs[] = {
  *  Fix Command Arguments for Aab_Ultrix_Limits
  */
 static const char* apzAab_Ultrix_LimitsPatch[] = {
-"/*\t@(#)limits.h\t\t\t\t*/\n\
-/* This file was generated by fixincludes\t*/\n\
-#ifndef _LIMITS_INCLUDED\n\
+"#ifndef _LIMITS_INCLUDED\n\
 #define _LIMITS_INCLUDED\n\
 #include <sys/limits.h>\n\
 #endif /* _LIMITS_INCLUDED */\n",
@@ -770,7 +741,7 @@ static const char* apzAab_Ultrix_LimitsPatch[] = {
  *
  *  Description of Aab_Ultrix_Memory fix
  */
-#define AAB_ULTRIX_MEMORY_FIXIDX         14
+#define AAB_ULTRIX_MEMORY_FIXIDX         15
 tSCC zAab_Ultrix_MemoryName[] =
      "AAB_ultrix_memory";
 
@@ -792,9 +763,7 @@ tSCC* apzAab_Ultrix_MemoryMachs[] = {
  *  Fix Command Arguments for Aab_Ultrix_Memory
  */
 static const char* apzAab_Ultrix_MemoryPatch[] = {
-"/*\t@(#)memory.h\t\t\t\t*/\n\
-/* This file was generated by fixincludes\t*/\n\
-#ifndef _MEMORY_INCLUDED\n\
+"#ifndef _MEMORY_INCLUDED\n\
 #define _MEMORY_INCLUDED\n\
 #include <strings.h>\n\
 #endif /* _MEMORY_INCLUDED */\n",
@@ -804,7 +773,7 @@ static const char* apzAab_Ultrix_MemoryPatch[] = {
  *
  *  Description of Aab_Ultrix_String fix
  */
-#define AAB_ULTRIX_STRING_FIXIDX         15
+#define AAB_ULTRIX_STRING_FIXIDX         16
 tSCC zAab_Ultrix_StringName[] =
      "AAB_ultrix_string";
 
@@ -826,9 +795,7 @@ tSCC* apzAab_Ultrix_StringMachs[] = {
  *  Fix Command Arguments for Aab_Ultrix_String
  */
 static const char* apzAab_Ultrix_StringPatch[] = {
-"/*\t@(#)string.h\t\t\t\t*/\n\
-/* This file was generated by fixincludes\t*/\n\
-#ifndef _STRING_INCLUDED\n\
+"#ifndef _STRING_INCLUDED\n\
 #define _STRING_INCLUDED\n\
 #include <strings.h>\n\
 #endif /* _STRING_INCLUDED */\n",
@@ -838,7 +805,7 @@ static const char* apzAab_Ultrix_StringPatch[] = {
  *
  *  Description of Aix_Pthread fix
  */
-#define AIX_PTHREAD_FIXIDX               16
+#define AIX_PTHREAD_FIXIDX               17
 tSCC zAix_PthreadName[] =
      "aix_pthread";
 
@@ -876,7 +843,7 @@ static const char* apzAix_PthreadPatch[] = {
  *
  *  Description of Aix_Sysmachine fix
  */
-#define AIX_SYSMACHINE_FIXIDX            17
+#define AIX_SYSMACHINE_FIXIDX            18
 tSCC zAix_SysmachineName[] =
      "aix_sysmachine";
 
@@ -912,7 +879,7 @@ static const char* apzAix_SysmachinePatch[] = {
  *
  *  Description of Aix_Syswait fix
  */
-#define AIX_SYSWAIT_FIXIDX               18
+#define AIX_SYSWAIT_FIXIDX               19
 tSCC zAix_SyswaitName[] =
      "aix_syswait";
 
@@ -952,7 +919,7 @@ static const char* apzAix_SyswaitPatch[] = {
  *
  *  Description of Aix_Volatile fix
  */
-#define AIX_VOLATILE_FIXIDX              19
+#define AIX_VOLATILE_FIXIDX              20
 tSCC zAix_VolatileName[] =
      "aix_volatile";
 
@@ -986,9 +953,45 @@ static const char* apzAix_VolatilePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Alpha___Assert fix
+ */
+#define ALPHA___ASSERT_FIXIDX            21
+tSCC zAlpha___AssertName[] =
+     "alpha___assert";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAlpha___AssertList[] =
+  "|assert.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAlpha___AssertMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAlpha___AssertSelect0[] =
+       "__assert\\(char \\*, char \\*, int\\)";
+
+#define    ALPHA___ASSERT_TEST_CT  1
+static tTestDesc aAlpha___AssertTests[] = {
+  { TT_EGREP,    zAlpha___AssertSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Alpha___Assert
+ */
+static const char* apzAlpha___AssertPatch[] = {
+    "format",
+    "__assert(const char *, const char *, int)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Alpha_Getopt fix
  */
-#define ALPHA_GETOPT_FIXIDX              20
+#define ALPHA_GETOPT_FIXIDX              22
 tSCC zAlpha_GetoptName[] =
      "alpha_getopt";
 
@@ -1024,7 +1027,7 @@ static const char* apzAlpha_GetoptPatch[] = {
  *
  *  Description of Alpha_Parens fix
  */
-#define ALPHA_PARENS_FIXIDX              21
+#define ALPHA_PARENS_FIXIDX              23
 tSCC zAlpha_ParensName[] =
      "alpha_parens";
 
@@ -1060,7 +1063,7 @@ static const char* apzAlpha_ParensPatch[] = {
  *
  *  Description of Alpha_Sbrk fix
  */
-#define ALPHA_SBRK_FIXIDX                22
+#define ALPHA_SBRK_FIXIDX                24
 tSCC zAlpha_SbrkName[] =
      "alpha_sbrk";
 
@@ -1096,7 +1099,7 @@ static const char* apzAlpha_SbrkPatch[] = {
  *
  *  Description of Arm_Norcroft_Hint fix
  */
-#define ARM_NORCROFT_HINT_FIXIDX         23
+#define ARM_NORCROFT_HINT_FIXIDX         25
 tSCC zArm_Norcroft_HintName[] =
      "arm_norcroft_hint";
 
@@ -1132,7 +1135,7 @@ static const char* apzArm_Norcroft_HintPatch[] = {
  *
  *  Description of Arm_Wchar fix
  */
-#define ARM_WCHAR_FIXIDX                 24
+#define ARM_WCHAR_FIXIDX                 26
 tSCC zArm_WcharName[] =
      "arm_wchar";
 
@@ -1169,7 +1172,7 @@ static const char* apzArm_WcharPatch[] = {
  *
  *  Description of Aux_Asm fix
  */
-#define AUX_ASM_FIXIDX                   25
+#define AUX_ASM_FIXIDX                   27
 tSCC zAux_AsmName[] =
      "aux_asm";
 
@@ -1205,7 +1208,7 @@ static const char* apzAux_AsmPatch[] = {
  *
  *  Description of Avoid_Bool_Define fix
  */
-#define AVOID_BOOL_DEFINE_FIXIDX         26
+#define AVOID_BOOL_DEFINE_FIXIDX         28
 tSCC zAvoid_Bool_DefineName[] =
      "avoid_bool_define";
 
@@ -1251,7 +1254,7 @@ static const char* apzAvoid_Bool_DefinePatch[] = {
  *
  *  Description of Avoid_Bool_Type fix
  */
-#define AVOID_BOOL_TYPE_FIXIDX           27
+#define AVOID_BOOL_TYPE_FIXIDX           29
 tSCC zAvoid_Bool_TypeName[] =
      "avoid_bool_type";
 
@@ -1290,14 +1293,13 @@ static const char* apzAvoid_Bool_TypePatch[] = {
     "#ifndef __cplusplus\n\
 %0\n\
 #endif",
-    "^[ \t]*typedef[ \t].*[ \t]bool[ \t]*;.*",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Avoid_Wchar_T_Type fix
  */
-#define AVOID_WCHAR_T_TYPE_FIXIDX        28
+#define AVOID_WCHAR_T_TYPE_FIXIDX        30
 tSCC zAvoid_Wchar_T_TypeName[] =
      "avoid_wchar_t_type";
 
@@ -1328,14 +1330,13 @@ static const char* apzAvoid_Wchar_T_TypePatch[] = {
     "#ifndef __cplusplus\n\
 %0\n\
 #endif",
-    "^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;.*",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Bad_Lval fix
  */
-#define BAD_LVAL_FIXIDX                  29
+#define BAD_LVAL_FIXIDX                  31
 tSCC zBad_LvalName[] =
      "bad_lval";
 
@@ -1370,7 +1371,7 @@ static const char* apzBad_LvalPatch[] = { "sed",
  *
  *  Description of Bad_Struct_Term fix
  */
-#define BAD_STRUCT_TERM_FIXIDX           30
+#define BAD_STRUCT_TERM_FIXIDX           32
 tSCC zBad_Struct_TermName[] =
      "bad_struct_term";
 
@@ -1406,7 +1407,7 @@ static const char* apzBad_Struct_TermPatch[] = {
  *
  *  Description of Badquote fix
  */
-#define BADQUOTE_FIXIDX                  31
+#define BADQUOTE_FIXIDX                  33
 tSCC zBadquoteName[] =
      "badquote";
 
@@ -1442,7 +1443,7 @@ static const char* apzBadquotePatch[] = {
  *
  *  Description of Broken_Assert_Stdio fix
  */
-#define BROKEN_ASSERT_STDIO_FIXIDX       32
+#define BROKEN_ASSERT_STDIO_FIXIDX       34
 tSCC zBroken_Assert_StdioName[] =
      "broken_assert_stdio";
 
@@ -1485,7 +1486,7 @@ static const char* apzBroken_Assert_StdioPatch[] = {
  *
  *  Description of Broken_Assert_Stdlib fix
  */
-#define BROKEN_ASSERT_STDLIB_FIXIDX      33
+#define BROKEN_ASSERT_STDLIB_FIXIDX      35
 tSCC zBroken_Assert_StdlibName[] =
      "broken_assert_stdlib";
 
@@ -1530,7 +1531,7 @@ static const char* apzBroken_Assert_StdlibPatch[] = {
  *
  *  Description of Broken_Cabs fix
  */
-#define BROKEN_CABS_FIXIDX               34
+#define BROKEN_CABS_FIXIDX               36
 tSCC zBroken_CabsName[] =
      "broken_cabs";
 
@@ -1567,7 +1568,7 @@ static const char* apzBroken_CabsPatch[] = {
  *
  *  Description of Ctrl_Quotes_Def fix
  */
-#define CTRL_QUOTES_DEF_FIXIDX           35
+#define CTRL_QUOTES_DEF_FIXIDX           37
 tSCC zCtrl_Quotes_DefName[] =
      "ctrl_quotes_def";
 
@@ -1602,7 +1603,7 @@ static const char* apzCtrl_Quotes_DefPatch[] = {
  *
  *  Description of Ctrl_Quotes_Use fix
  */
-#define CTRL_QUOTES_USE_FIXIDX           36
+#define CTRL_QUOTES_USE_FIXIDX           38
 tSCC zCtrl_Quotes_UseName[] =
      "ctrl_quotes_use";
 
@@ -1637,7 +1638,7 @@ static const char* apzCtrl_Quotes_UsePatch[] = {
  *
  *  Description of Cxx_Unready fix
  */
-#define CXX_UNREADY_FIXIDX               37
+#define CXX_UNREADY_FIXIDX               39
 tSCC zCxx_UnreadyName[] =
      "cxx_unready";
 
@@ -1685,7 +1686,7 @@ extern \"C\" {\n\
  *
  *  Description of Dec_Intern_Asm fix
  */
-#define DEC_INTERN_ASM_FIXIDX            38
+#define DEC_INTERN_ASM_FIXIDX            40
 tSCC zDec_Intern_AsmName[] =
      "dec_intern_asm";
 
@@ -1713,9 +1714,53 @@ static const char* apzDec_Intern_AsmPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Djgpp_Wchar_H fix
+ */
+#define DJGPP_WCHAR_H_FIXIDX             41
+tSCC zDjgpp_Wchar_HName[] =
+     "djgpp_wchar_h";
+
+/*
+ *  File name selection pattern
+ */
+#define zDjgpp_Wchar_HList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzDjgpp_Wchar_HMachs (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";
+
+#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 Djgpp_Wchar_H
+ */
+static const char* apzDjgpp_Wchar_HPatch[] = {
+    "format",
+    "%0\n\
+#include <sys/djtypes.h>",
+    "#include <stddef.h>",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Ecd_Cursor fix
  */
-#define ECD_CURSOR_FIXIDX                39
+#define ECD_CURSOR_FIXIDX                42
 tSCC zEcd_CursorName[] =
      "ecd_cursor";
 
@@ -1751,7 +1796,7 @@ static const char* apzEcd_CursorPatch[] = {
  *
  *  Description of Fix_Header_Breakage fix
  */
-#define FIX_HEADER_BREAKAGE_FIXIDX       40
+#define FIX_HEADER_BREAKAGE_FIXIDX       43
 tSCC zFix_Header_BreakageName[] =
      "fix_header_breakage";
 
@@ -1787,9 +1832,54 @@ static const char* apzFix_Header_BreakagePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Freebsd_Gcc3_Breakage fix
+ */
+#define FREEBSD_GCC3_BREAKAGE_FIXIDX     44
+tSCC zFreebsd_Gcc3_BreakageName[] =
+     "freebsd_gcc3_breakage";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zFreebsd_Gcc3_BreakageList[] =
+  "|sys/cdefs.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzFreebsd_Gcc3_BreakageMachs[] = {
+        "*-*-freebsd*",
+        (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)";
+
+#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 Freebsd_Gcc3_Breakage
+ */
+static const char* apzFreebsd_Gcc3_BreakagePatch[] = {
+    "format",
+    "%0 || __GNUC__ >= 3",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Hp_Inline fix
  */
-#define HP_INLINE_FIXIDX                 41
+#define HP_INLINE_FIXIDX                 45
 tSCC zHp_InlineName[] =
      "hp_inline";
 
@@ -1826,7 +1916,7 @@ static const char* apzHp_InlinePatch[] = {
  *
  *  Description of Hp_Sysfile fix
  */
-#define HP_SYSFILE_FIXIDX                42
+#define HP_SYSFILE_FIXIDX                46
 tSCC zHp_SysfileName[] =
      "hp_sysfile";
 
@@ -1863,7 +1953,7 @@ static const char* apzHp_SysfilePatch[] = {
  *
  *  Description of Hpux11_Fabsf fix
  */
-#define HPUX11_FABSF_FIXIDX              43
+#define HPUX11_FABSF_FIXIDX              47
 tSCC zHpux11_FabsfName[] =
      "hpux11_fabsf";
 
@@ -1908,7 +1998,7 @@ static const char* apzHpux11_FabsfPatch[] = {
  *
  *  Description of Hpux11_Uint32_C fix
  */
-#define HPUX11_UINT32_C_FIXIDX           44
+#define HPUX11_UINT32_C_FIXIDX           48
 tSCC zHpux11_Uint32_CName[] =
      "hpux11_uint32_c";
 
@@ -1944,7 +2034,7 @@ static const char* apzHpux11_Uint32_CPatch[] = {
  *
  *  Description of Hpux8_Bogus_Inlines fix
  */
-#define HPUX8_BOGUS_INLINES_FIXIDX       45
+#define HPUX8_BOGUS_INLINES_FIXIDX       49
 tSCC zHpux8_Bogus_InlinesName[] =
      "hpux8_bogus_inlines";
 
@@ -1982,7 +2072,7 @@ static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
  *
  *  Description of Int_Abort_Free_And_Exit fix
  */
-#define INT_ABORT_FREE_AND_EXIT_FIXIDX   46
+#define INT_ABORT_FREE_AND_EXIT_FIXIDX   50
 tSCC zInt_Abort_Free_And_ExitName[] =
      "int_abort_free_and_exit";
 
@@ -2018,7 +2108,7 @@ static const char* apzInt_Abort_Free_And_ExitPatch[] = {
  *
  *  Description of Isc_Omits_With_Stdc fix
  */
-#define ISC_OMITS_WITH_STDC_FIXIDX       47
+#define ISC_OMITS_WITH_STDC_FIXIDX       51
 tSCC zIsc_Omits_With_StdcName[] =
      "isc_omits_with_stdc";
 
@@ -2054,7 +2144,7 @@ static const char* apzIsc_Omits_With_StdcPatch[] = {
  *
  *  Description of Io_Quotes_Def fix
  */
-#define IO_QUOTES_DEF_FIXIDX             48
+#define IO_QUOTES_DEF_FIXIDX             52
 tSCC zIo_Quotes_DefName[] =
      "io_quotes_def";
 
@@ -2089,7 +2179,7 @@ static const char* apzIo_Quotes_DefPatch[] = {
  *
  *  Description of Io_Quotes_Use fix
  */
-#define IO_QUOTES_USE_FIXIDX             49
+#define IO_QUOTES_USE_FIXIDX             53
 tSCC zIo_Quotes_UseName[] =
      "io_quotes_use";
 
@@ -2124,7 +2214,7 @@ static const char* apzIo_Quotes_UsePatch[] = {
  *
  *  Description of Hpux_Maxint fix
  */
-#define HPUX_MAXINT_FIXIDX               50
+#define HPUX_MAXINT_FIXIDX               54
 tSCC zHpux_MaxintName[] =
      "hpux_maxint";
 
@@ -2142,10 +2232,24 @@ tSCC zHpux_MaxintList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zHpux_MaxintSelect0[] =
-       "^#[ \t]*define[ \t]*MAXINT[ \t]";
+       "^#[ \t]*define[ \t]+MAXINT[ \t]";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zHpux_MaxintBypass0[] =
+       "^#[ \t]*ifndef[ \t]+MAXINT";
 
-#define    HPUX_MAXINT_TEST_CT  1
+/*
+ *  perform the 'test' shell command - do fix on success
+ */
+tSCC zHpux_MaxintTest0[] =
+       "-n \"`egrep '#[ \t]*define[ \t]+MAXINT[ \t]' sys/param.h`\"";
+
+#define    HPUX_MAXINT_TEST_CT  3
 static tTestDesc aHpux_MaxintTests[] = {
+  { TT_TEST,     zHpux_MaxintTest0,   0 /* unused */ },
+  { TT_NEGREP,   zHpux_MaxintBypass0, (regex_t*)NULL },
   { TT_EGREP,    zHpux_MaxintSelect0, (regex_t*)NULL }, };
 
 /*
@@ -2156,14 +2260,14 @@ static const char* apzHpux_MaxintPatch[] = {
     "#ifndef MAXINT\n\
 %0\n\
 #endif",
-    "^#[ \t]*define[ \t]*MAXINT[ \t].*",
+    "^#[ \t]*define[ \t]+MAXINT[ \t].*",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Hpux_Systime fix
  */
-#define HPUX_SYSTIME_FIXIDX              51
+#define HPUX_SYSTIME_FIXIDX              55
 tSCC zHpux_SystimeName[] =
      "hpux_systime";
 
@@ -2199,7 +2303,7 @@ static const char* apzHpux_SystimePatch[] = {
  *
  *  Description of Ip_Missing_Semi fix
  */
-#define IP_MISSING_SEMI_FIXIDX           52
+#define IP_MISSING_SEMI_FIXIDX           56
 tSCC zIp_Missing_SemiName[] =
      "ip_missing_semi";
 
@@ -2234,7 +2338,7 @@ static const char* apzIp_Missing_SemiPatch[] = { "sed",
  *
  *  Description of Irix_Asm_Apostrophe fix
  */
-#define IRIX_ASM_APOSTROPHE_FIXIDX       53
+#define IRIX_ASM_APOSTROPHE_FIXIDX       57
 tSCC zIrix_Asm_ApostropheName[] =
      "irix_asm_apostrophe";
 
@@ -2269,9 +2373,81 @@ static const char* apzIrix_Asm_ApostrophePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Irix_Stdio_Va_List fix
+ */
+#define IRIX_STDIO_VA_LIST_FIXIDX        58
+tSCC zIrix_Stdio_Va_ListName[] =
+     "irix_stdio_va_list";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_Stdio_Va_ListList[] =
+  "|stdio.h|";
+/*
+ *  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[] =
+       "(printf\\(.*), /\\* 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 }, };
+
+/*
+ *  Fix Command Arguments for Irix_Stdio_Va_List
+ */
+static const char* apzIrix_Stdio_Va_ListPatch[] = {
+    "format",
+    "%1, __gnuc_va_list",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Irix_Limits_Const fix
+ */
+#define IRIX_LIMITS_CONST_FIXIDX         59
+tSCC zIrix_Limits_ConstName[] =
+     "irix_limits_const";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_Limits_ConstList[] =
+  "|fixinc-test-limits.h|limits.h|";
+/*
+ *  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 }, };
+
+/*
+ *  Fix Command Arguments for Irix_Limits_Const
+ */
+static const char* apzIrix_Limits_ConstPatch[] = {
+    "format",
+    "extern __const ",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Isc_Fmod fix
  */
-#define ISC_FMOD_FIXIDX                  54
+#define ISC_FMOD_FIXIDX                  60
 tSCC zIsc_FmodName[] =
      "isc_fmod";
 
@@ -2307,7 +2483,7 @@ static const char* apzIsc_FmodPatch[] = {
  *
  *  Description of Kandr_Concat fix
  */
-#define KANDR_CONCAT_FIXIDX              55
+#define KANDR_CONCAT_FIXIDX              61
 tSCC zKandr_ConcatName[] =
      "kandr_concat";
 
@@ -2343,7 +2519,7 @@ static const char* apzKandr_ConcatPatch[] = {
  *
  *  Description of Libc1_Ifdefd_Memx fix
  */
-#define LIBC1_IFDEFD_MEMX_FIXIDX         56
+#define LIBC1_IFDEFD_MEMX_FIXIDX         62
 tSCC zLibc1_Ifdefd_MemxName[] =
      "libc1_ifdefd_memx";
 
@@ -2392,7 +2568,7 @@ extern [a-z_]+ mem.*(\n\
  *
  *  Description of Limits_Ifndefs fix
  */
-#define LIMITS_IFNDEFS_FIXIDX            57
+#define LIMITS_IFNDEFS_FIXIDX            63
 tSCC zLimits_IfndefsName[] =
      "limits_ifndefs";
 
@@ -2431,7 +2607,7 @@ static const char* apzLimits_IfndefsPatch[] = {
  *
  *  Description of Lynx_Void_Int fix
  */
-#define LYNX_VOID_INT_FIXIDX             58
+#define LYNX_VOID_INT_FIXIDX             64
 tSCC zLynx_Void_IntName[] =
      "lynx_void_int";
 
@@ -2467,7 +2643,7 @@ static const char* apzLynx_Void_IntPatch[] = {
  *
  *  Description of Lynxos_Fcntl_Proto fix
  */
-#define LYNXOS_FCNTL_PROTO_FIXIDX        59
+#define LYNXOS_FCNTL_PROTO_FIXIDX        65
 tSCC zLynxos_Fcntl_ProtoName[] =
      "lynxos_fcntl_proto";
 
@@ -2504,7 +2680,7 @@ static const char* apzLynxos_Fcntl_ProtoPatch[] = {
  *
  *  Description of M88k_Bad_Hypot_Opt fix
  */
-#define M88K_BAD_HYPOT_OPT_FIXIDX        60
+#define M88K_BAD_HYPOT_OPT_FIXIDX        66
 tSCC zM88k_Bad_Hypot_OptName[] =
      "m88k_bad_hypot_opt";
 
@@ -2553,7 +2729,7 @@ static __inline__ double fake_hypot (x, y)\n\
  *
  *  Description of M88k_Bad_S_If fix
  */
-#define M88K_BAD_S_IF_FIXIDX             61
+#define M88K_BAD_S_IF_FIXIDX             67
 tSCC zM88k_Bad_S_IfName[] =
      "m88k_bad_s_if";
 
@@ -2592,7 +2768,7 @@ static const char* apzM88k_Bad_S_IfPatch[] = {
  *
  *  Description of M88k_Multi_Incl fix
  */
-#define M88K_MULTI_INCL_FIXIDX           62
+#define M88K_MULTI_INCL_FIXIDX           68
 tSCC zM88k_Multi_InclName[] =
      "m88k_multi_incl";
 
@@ -2629,15 +2805,14 @@ static const char* apzM88k_Multi_InclPatch[] = {
  *
  *  Description of Machine_Ansi_H_Va_List fix
  */
-#define MACHINE_ANSI_H_VA_LIST_FIXIDX    63
+#define MACHINE_ANSI_H_VA_LIST_FIXIDX    69
 tSCC zMachine_Ansi_H_Va_ListName[] =
      "machine_ansi_h_va_list";
 
 /*
  *  File name selection pattern
  */
-tSCC zMachine_Ansi_H_Va_ListList[] =
-  "|machine/ansi.h|";
+#define zMachine_Ansi_H_Va_ListList (char*)NULL
 /*
  *  Machine/OS name selection pattern
  */
@@ -2673,7 +2848,7 @@ static const char* apzMachine_Ansi_H_Va_ListPatch[] = {
  *
  *  Description of Machine_Name fix
  */
-#define MACHINE_NAME_FIXIDX              64
+#define MACHINE_NAME_FIXIDX              70
 tSCC zMachine_NameName[] =
      "machine_name";
 
@@ -2706,7 +2881,7 @@ static const char* apzMachine_NamePatch[] = {
  *
  *  Description of Math_Exception fix
  */
-#define MATH_EXCEPTION_FIXIDX            65
+#define MATH_EXCEPTION_FIXIDX            71
 tSCC zMath_ExceptionName[] =
      "math_exception";
 
@@ -2754,7 +2929,7 @@ static const char* apzMath_ExceptionPatch[] = {
  *
  *  Description of Math_Huge_Val_From_Dbl_Max fix
  */
-#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 66
+#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 72
 tSCC zMath_Huge_Val_From_Dbl_MaxName[] =
      "math_huge_val_from_dbl_max";
 
@@ -2789,8 +2964,7 @@ static tTestDesc aMath_Huge_Val_From_Dbl_MaxTests[] = {
  *  Fix Command Arguments for Math_Huge_Val_From_Dbl_Max
  */
 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\
+    "\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\
@@ -2801,7 +2975,7 @@ static const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c",
  *
  *  Description of Math_Huge_Val_Ifndef fix
  */
-#define MATH_HUGE_VAL_IFNDEF_FIXIDX      67
+#define MATH_HUGE_VAL_IFNDEF_FIXIDX      73
 tSCC zMath_Huge_Val_IfndefName[] =
      "math_huge_val_ifndef";
 
@@ -2840,7 +3014,7 @@ static const char* apzMath_Huge_Val_IfndefPatch[] = {
  *
  *  Description of Nested_Motorola fix
  */
-#define NESTED_MOTOROLA_FIXIDX           68
+#define NESTED_MOTOROLA_FIXIDX           74
 tSCC zNested_MotorolaName[] =
      "nested_motorola";
 
@@ -2878,7 +3052,7 @@ static const char* apzNested_MotorolaPatch[] = { "sed",
  *
  *  Description of Nested_Sys_Limits fix
  */
-#define NESTED_SYS_LIMITS_FIXIDX         69
+#define NESTED_SYS_LIMITS_FIXIDX         75
 tSCC zNested_Sys_LimitsName[] =
      "nested_sys_limits";
 
@@ -2914,7 +3088,7 @@ static const char* apzNested_Sys_LimitsPatch[] = { "sed",
  *
  *  Description of Nested_Auth_Des fix
  */
-#define NESTED_AUTH_DES_FIXIDX           70
+#define NESTED_AUTH_DES_FIXIDX           76
 tSCC zNested_Auth_DesName[] =
      "nested_auth_des";
 
@@ -2950,7 +3124,7 @@ static const char* apzNested_Auth_DesPatch[] = {
  *
  *  Description of News_Os_Recursion fix
  */
-#define NEWS_OS_RECURSION_FIXIDX         71
+#define NEWS_OS_RECURSION_FIXIDX         77
 tSCC zNews_Os_RecursionName[] =
      "news_os_recursion";
 
@@ -2988,7 +3162,7 @@ static const char* apzNews_Os_RecursionPatch[] = {
  *
  *  Description of Next_Math_Prefix fix
  */
-#define NEXT_MATH_PREFIX_FIXIDX          72
+#define NEXT_MATH_PREFIX_FIXIDX          78
 tSCC zNext_Math_PrefixName[] =
      "next_math_prefix";
 
@@ -3025,7 +3199,7 @@ static const char* apzNext_Math_PrefixPatch[] = {
  *
  *  Description of Next_Template fix
  */
-#define NEXT_TEMPLATE_FIXIDX             73
+#define NEXT_TEMPLATE_FIXIDX             79
 tSCC zNext_TemplateName[] =
      "next_template";
 
@@ -3062,7 +3236,7 @@ static const char* apzNext_TemplatePatch[] = {
  *
  *  Description of Next_Volitile fix
  */
-#define NEXT_VOLITILE_FIXIDX             74
+#define NEXT_VOLITILE_FIXIDX             80
 tSCC zNext_VolitileName[] =
      "next_volitile";
 
@@ -3099,7 +3273,7 @@ static const char* apzNext_VolitilePatch[] = {
  *
  *  Description of Next_Wait_Union fix
  */
-#define NEXT_WAIT_UNION_FIXIDX           75
+#define NEXT_WAIT_UNION_FIXIDX           81
 tSCC zNext_Wait_UnionName[] =
      "next_wait_union";
 
@@ -3135,7 +3309,7 @@ static const char* apzNext_Wait_UnionPatch[] = {
  *
  *  Description of Nodeent_Syntax fix
  */
-#define NODEENT_SYNTAX_FIXIDX            76
+#define NODEENT_SYNTAX_FIXIDX            82
 tSCC zNodeent_SyntaxName[] =
      "nodeent_syntax";
 
@@ -3171,7 +3345,7 @@ static const char* apzNodeent_SyntaxPatch[] = {
  *
  *  Description of Osf_Namespace_A fix
  */
-#define OSF_NAMESPACE_A_FIXIDX           77
+#define OSF_NAMESPACE_A_FIXIDX           83
 tSCC zOsf_Namespace_AName[] =
      "osf_namespace_a";
 
@@ -3217,7 +3391,7 @@ static const char* apzOsf_Namespace_APatch[] = {
  *
  *  Description of Osf_Namespace_C fix
  */
-#define OSF_NAMESPACE_C_FIXIDX           78
+#define OSF_NAMESPACE_C_FIXIDX           84
 tSCC zOsf_Namespace_CName[] =
      "osf_namespace_c";
 
@@ -3272,7 +3446,7 @@ typedef __regmatch_t\tregmatch_t;",
  *
  *  Description of Pthread_Page_Size fix
  */
-#define PTHREAD_PAGE_SIZE_FIXIDX         79
+#define PTHREAD_PAGE_SIZE_FIXIDX         85
 tSCC zPthread_Page_SizeName[] =
      "pthread_page_size";
 
@@ -3308,7 +3482,7 @@ static const char* apzPthread_Page_SizePatch[] = {
  *
  *  Description of Read_Ret_Type fix
  */
-#define READ_RET_TYPE_FIXIDX             80
+#define READ_RET_TYPE_FIXIDX             86
 tSCC zRead_Ret_TypeName[] =
      "read_ret_type";
 
@@ -3346,7 +3520,7 @@ static const char* apzRead_Ret_TypePatch[] = {
  *
  *  Description of Rs6000_Double fix
  */
-#define RS6000_DOUBLE_FIXIDX             81
+#define RS6000_DOUBLE_FIXIDX             87
 tSCC zRs6000_DoubleName[] =
      "rs6000_double";
 
@@ -3385,7 +3559,7 @@ static const char* apzRs6000_DoublePatch[] = {
  *
  *  Description of Rs6000_Fchmod fix
  */
-#define RS6000_FCHMOD_FIXIDX             82
+#define RS6000_FCHMOD_FIXIDX             88
 tSCC zRs6000_FchmodName[] =
      "rs6000_fchmod";
 
@@ -3421,7 +3595,7 @@ static const char* apzRs6000_FchmodPatch[] = {
  *
  *  Description of Rs6000_Param fix
  */
-#define RS6000_PARAM_FIXIDX              83
+#define RS6000_PARAM_FIXIDX              89
 tSCC zRs6000_ParamName[] =
      "rs6000_param";
 
@@ -3457,7 +3631,7 @@ static const char* apzRs6000_ParamPatch[] = {
  *
  *  Description of Sco_Static_Func fix
  */
-#define SCO_STATIC_FUNC_FIXIDX           84
+#define SCO_STATIC_FUNC_FIXIDX           90
 tSCC zSco_Static_FuncName[] =
      "sco_static_func";
 
@@ -3499,47 +3673,133 @@ extern \"C\" {\\\n\
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sco_Strict_Ansi fix
+ *  Description of Strict_Ansi_Not fix
  */
-#define SCO_STRICT_ANSI_FIXIDX           85
-tSCC zSco_Strict_AnsiName[] =
-     "sco_strict_ansi";
+#define STRICT_ANSI_NOT_FIXIDX           91
+tSCC zStrict_Ansi_NotName[] =
+     "strict_ansi_not";
 
 /*
  *  File name selection pattern
  */
-#define zSco_Strict_AnsiList (char*)NULL
+#define zStrict_Ansi_NotList (char*)NULL
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSco_Strict_AnsiMachs[] = {
-        "i?86-*-sco3.2*",
-        (const char*)NULL };
+#define apzStrict_Ansi_NotMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSco_Strict_AnsiSelect0[] =
-       "^[ \t]*#[ \t]*if.*!__STDC__";
+tSCC zStrict_Ansi_NotSelect0[] =
+       "^([ \t]*#[ \t]*if.*)(!__STDC__|__STDC__[ \t]*==[ \t]*0|__STDC__[ \t]*!=[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)(.*)";
 
-#define    SCO_STRICT_ANSI_TEST_CT  1
-static tTestDesc aSco_Strict_AnsiTests[] = {
-  { TT_EGREP,    zSco_Strict_AnsiSelect0, (regex_t*)NULL }, };
+/*
+ *  perform the C function call test
+ */
+tSCC zStrict_Ansi_NotFTst0[] = "stdc_0_in_system_headers";
+
+#define    STRICT_ANSI_NOT_TEST_CT  2
+static tTestDesc aStrict_Ansi_NotTests[] = {
+  { TT_FUNCTION, zStrict_Ansi_NotFTst0,   0 /* unused */ },
+  { TT_EGREP,    zStrict_Ansi_NotSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sco_Strict_Ansi
+ *  Fix Command Arguments for Strict_Ansi_Not
  */
-static const char* apzSco_Strict_AnsiPatch[] = {
+static const char* apzStrict_Ansi_NotPatch[] = {
     "format",
-    "%1defined(__STRICT_ANSI__)%2",
-    "^([ \t]*#[ \t]*if[ \t].*!)__STDC__(.*)",
+    "%1 !defined(__STRICT_ANSI__)%3",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Strict_Ansi_Not_Ctd fix
+ */
+#define STRICT_ANSI_NOT_CTD_FIXIDX       92
+tSCC zStrict_Ansi_Not_CtdName[] =
+     "strict_ansi_not_ctd";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zStrict_Ansi_Not_CtdList[] =
+  "|math.h|limits.h|stdio.h|signal.h|stdlib.h|time.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzStrict_Ansi_Not_CtdMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zStrict_Ansi_Not_CtdSelect0[] =
+       "^([ \t]*[|&][|&][ \t(]*)(__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)(.*)";
+
+/*
+ *  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 Strict_Ansi_Not_Ctd
+ */
+static const char* apzStrict_Ansi_Not_CtdPatch[] = {
+    "format",
+    "%1 !defined(__STRICT_ANSI__)%3",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Strict_Ansi_Only fix
+ */
+#define STRICT_ANSI_ONLY_FIXIDX          93
+tSCC zStrict_Ansi_OnlyName[] =
+     "strict_ansi_only";
+
+/*
+ *  File name selection pattern
+ */
+#define zStrict_Ansi_OnlyList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzStrict_Ansi_OnlyMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zStrict_Ansi_OnlySelect0[] =
+       "^([ \t]*#[ \t]*if.*)(__STDC__[ \t]*!=[ \t]*0|__STDC__[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*!=[ \t]*0)(.*)";
+
+/*
+ *  perform the C function call test
+ */
+tSCC zStrict_Ansi_OnlyFTst0[] = "stdc_0_in_system_headers";
+
+#define    STRICT_ANSI_ONLY_TEST_CT  2
+static tTestDesc aStrict_Ansi_OnlyTests[] = {
+  { TT_FUNCTION, zStrict_Ansi_OnlyFTst0,   0 /* unused */ },
+  { TT_EGREP,    zStrict_Ansi_OnlySelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Strict_Ansi_Only
+ */
+static const char* apzStrict_Ansi_OnlyPatch[] = {
+    "format",
+    "%1 defined(__STRICT_ANSI__)%3",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Sco_Utime fix
  */
-#define SCO_UTIME_FIXIDX                 86
+#define SCO_UTIME_FIXIDX                 94
 tSCC zSco_UtimeName[] =
      "sco_utime";
 
@@ -3575,9 +3835,46 @@ static const char* apzSco_UtimePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Solaris27_Mutex_Init fix
+ */
+#define SOLARIS27_MUTEX_INIT_FIXIDX      95
+tSCC zSolaris27_Mutex_InitName[] =
+     "solaris27_mutex_init";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSolaris27_Mutex_InitList[] =
+  "|pthread.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSolaris27_Mutex_InitMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris27_Mutex_InitSelect0[] =
+       "@\\(#\\)pthread.h[ \t]+1.26[ \t]+98/04/12 SMI";
+
+#define    SOLARIS27_MUTEX_INIT_TEST_CT  1
+static tTestDesc aSolaris27_Mutex_InitTests[] = {
+  { TT_EGREP,    zSolaris27_Mutex_InitSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Solaris27_Mutex_Init
+ */
+static const char* apzSolaris27_Mutex_InitPatch[] = {
+    "format",
+    "%1, {0}}",
+    "(define[ \t]+PTHREAD_MUTEX_INITIALIZER.*),[ \t]*0}$",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Statsswtch fix
  */
-#define STATSSWTCH_FIXIDX                87
+#define STATSSWTCH_FIXIDX                96
 tSCC zStatsswtchName[] =
      "statsswtch";
 
@@ -3613,7 +3910,7 @@ static const char* apzStatsswtchPatch[] = {
  *
  *  Description of Stdio_Stdarg_H fix
  */
-#define STDIO_STDARG_H_FIXIDX            88
+#define STDIO_STDARG_H_FIXIDX            97
 tSCC zStdio_Stdarg_HName[] =
      "stdio_stdarg_h";
 
@@ -3650,7 +3947,7 @@ static const char* apzStdio_Stdarg_HPatch[] = {
  *
  *  Description of Stdio_Va_List fix
  */
-#define STDIO_VA_LIST_FIXIDX             89
+#define STDIO_VA_LIST_FIXIDX             98
 tSCC zStdio_Va_ListName[] =
      "stdio_va_list";
 
@@ -3668,7 +3965,7 @@ tSCC zStdio_Va_ListList[] =
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zStdio_Va_ListBypass0[] =
-       "__gnuc_va_list|_BSD_VA_LIST_";
+       "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list";
 
 #define    STDIO_VA_LIST_TEST_CT  1
 static tTestDesc aStdio_Va_ListTests[] = {
@@ -3695,7 +3992,7 @@ s@_Va_LIST@_VA_LIST@",
  *
  *  Description of Struct_File fix
  */
-#define STRUCT_FILE_FIXIDX               90
+#define STRUCT_FILE_FIXIDX               99
 tSCC zStruct_FileName[] =
      "struct_file";
 
@@ -3732,7 +4029,7 @@ static const char* apzStruct_FilePatch[] = {
  *
  *  Description of Struct_Sockaddr fix
  */
-#define STRUCT_SOCKADDR_FIXIDX           91
+#define STRUCT_SOCKADDR_FIXIDX           100
 tSCC zStruct_SockaddrName[] =
      "struct_sockaddr";
 
@@ -3776,7 +4073,7 @@ static const char* apzStruct_SockaddrPatch[] = {
  *
  *  Description of Sun_Auth_Proto fix
  */
-#define SUN_AUTH_PROTO_FIXIDX            92
+#define SUN_AUTH_PROTO_FIXIDX            101
 tSCC zSun_Auth_ProtoName[] =
      "sun_auth_proto";
 
@@ -3817,7 +4114,7 @@ static const char* apzSun_Auth_ProtoPatch[] = {
  *
  *  Description of Sun_Bogus_Ifdef fix
  */
-#define SUN_BOGUS_IFDEF_FIXIDX           93
+#define SUN_BOGUS_IFDEF_FIXIDX           102
 tSCC zSun_Bogus_IfdefName[] =
      "sun_bogus_ifdef";
 
@@ -3853,7 +4150,7 @@ static const char* apzSun_Bogus_IfdefPatch[] = {
  *
  *  Description of Sun_Catmacro fix
  */
-#define SUN_CATMACRO_FIXIDX              94
+#define SUN_CATMACRO_FIXIDX              103
 tSCC zSun_CatmacroName[] =
      "sun_catmacro";
 
@@ -3893,7 +4190,7 @@ static const char* apzSun_CatmacroPatch[] = {
  *
  *  Description of Sun_Malloc fix
  */
-#define SUN_MALLOC_FIXIDX                95
+#define SUN_MALLOC_FIXIDX                104
 tSCC zSun_MallocName[] =
      "sun_malloc";
 
@@ -3924,7 +4221,7 @@ static const char* apzSun_MallocPatch[] = { "sed",
  *
  *  Description of Sun_Rusers_Semi fix
  */
-#define SUN_RUSERS_SEMI_FIXIDX           96
+#define SUN_RUSERS_SEMI_FIXIDX           105
 tSCC zSun_Rusers_SemiName[] =
      "sun_rusers_semi";
 
@@ -3959,7 +4256,7 @@ static const char* apzSun_Rusers_SemiPatch[] = { "sed",
  *
  *  Description of Sun_Signal fix
  */
-#define SUN_SIGNAL_FIXIDX                97
+#define SUN_SIGNAL_FIXIDX                106
 tSCC zSun_SignalName[] =
      "sun_signal";
 
@@ -3999,7 +4296,7 @@ void\t(*signal(...))(...);\n\
  *
  *  Description of Sunos_Matherr_Decl fix
  */
-#define SUNOS_MATHERR_DECL_FIXIDX        98
+#define SUNOS_MATHERR_DECL_FIXIDX        107
 tSCC zSunos_Matherr_DeclName[] =
      "sunos_matherr_decl";
 
@@ -4023,7 +4320,7 @@ tSCC zSunos_Matherr_DeclSelect0[] =
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zSunos_Matherr_DeclBypass0[] =
-       "matherr.*struct exception";
+       "matherr.*(struct exception|__MATH_EXCEPTION)";
 
 #define    SUNOS_MATHERR_DECL_TEST_CT  2
 static tTestDesc aSunos_Matherr_DeclTests[] = {
@@ -4042,7 +4339,7 @@ static const char* apzSunos_Matherr_DeclPatch[] = {
  *
  *  Description of Sunos_Strlen fix
  */
-#define SUNOS_STRLEN_FIXIDX              99
+#define SUNOS_STRLEN_FIXIDX              108
 tSCC zSunos_StrlenName[] =
      "sunos_strlen";
 
@@ -4078,7 +4375,7 @@ static const char* apzSunos_StrlenPatch[] = {
  *
  *  Description of Svr4__P fix
  */
-#define SVR4__P_FIXIDX                   100
+#define SVR4__P_FIXIDX                   109
 tSCC zSvr4__PName[] =
      "svr4__p";
 
@@ -4116,7 +4413,7 @@ static const char* apzSvr4__PPatch[] = {
  *
  *  Description of Svr4_Getcwd fix
  */
-#define SVR4_GETCWD_FIXIDX               101
+#define SVR4_GETCWD_FIXIDX               110
 tSCC zSvr4_GetcwdName[] =
      "svr4_getcwd";
 
@@ -4152,7 +4449,7 @@ static const char* apzSvr4_GetcwdPatch[] = {
  *
  *  Description of Svr4_Profil fix
  */
-#define SVR4_PROFIL_FIXIDX               102
+#define SVR4_PROFIL_FIXIDX               111
 tSCC zSvr4_ProfilName[] =
      "svr4_profil";
 
@@ -4188,7 +4485,7 @@ static const char* apzSvr4_ProfilPatch[] = {
  *
  *  Description of Gnu_Types fix
  */
-#define GNU_TYPES_FIXIDX                 103
+#define GNU_TYPES_FIXIDX                 112
 tSCC zGnu_TypesName[] =
      "gnu_types";
 
@@ -4230,7 +4527,7 @@ static const char* apzGnu_TypesPatch[] = {
  *
  *  Description of Sysv68_String fix
  */
-#define SYSV68_STRING_FIXIDX             104
+#define SYSV68_STRING_FIXIDX             113
 tSCC zSysv68_StringName[] =
      "sysv68_string";
 
@@ -4267,7 +4564,7 @@ extern unsigned int\\\n\
  *
  *  Description of Sysz_Stdlib_For_Sun fix
  */
-#define SYSZ_STDLIB_FOR_SUN_FIXIDX       105
+#define SYSZ_STDLIB_FOR_SUN_FIXIDX       114
 tSCC zSysz_Stdlib_For_SunName[] =
      "sysz_stdlib_for_sun";
 
@@ -4303,7 +4600,7 @@ static const char* apzSysz_Stdlib_For_SunPatch[] = {
  *
  *  Description of Tinfo_Cplusplus fix
  */
-#define TINFO_CPLUSPLUS_FIXIDX           106
+#define TINFO_CPLUSPLUS_FIXIDX           115
 tSCC zTinfo_CplusplusName[] =
      "tinfo_cplusplus";
 
@@ -4339,7 +4636,7 @@ static const char* apzTinfo_CplusplusPatch[] = {
  *
  *  Description of Ultrix_Atof_Param fix
  */
-#define ULTRIX_ATOF_PARAM_FIXIDX         107
+#define ULTRIX_ATOF_PARAM_FIXIDX         116
 tSCC zUltrix_Atof_ParamName[] =
      "ultrix_atof_param";
 
@@ -4375,7 +4672,7 @@ static const char* apzUltrix_Atof_ParamPatch[] = {
  *
  *  Description of Ultrix_Const fix
  */
-#define ULTRIX_CONST_FIXIDX              108
+#define ULTRIX_CONST_FIXIDX              117
 tSCC zUltrix_ConstName[] =
      "ultrix_const";
 
@@ -4412,7 +4709,7 @@ static const char* apzUltrix_ConstPatch[] = {
  *
  *  Description of Ultrix_Const2 fix
  */
-#define ULTRIX_CONST2_FIXIDX             109
+#define ULTRIX_CONST2_FIXIDX             118
 tSCC zUltrix_Const2Name[] =
      "ultrix_const2";
 
@@ -4449,7 +4746,7 @@ static const char* apzUltrix_Const2Patch[] = {
  *
  *  Description of Ultrix_Fix_Fixproto fix
  */
-#define ULTRIX_FIX_FIXPROTO_FIXIDX       110
+#define ULTRIX_FIX_FIXPROTO_FIXIDX       119
 tSCC zUltrix_Fix_FixprotoName[] =
      "ultrix_fix_fixproto";
 
@@ -4487,7 +4784,7 @@ static const char* apzUltrix_Fix_FixprotoPatch[] = {
  *
  *  Description of Ultrix_Ifdef fix
  */
-#define ULTRIX_IFDEF_FIXIDX              111
+#define ULTRIX_IFDEF_FIXIDX              120
 tSCC zUltrix_IfdefName[] =
      "ultrix_ifdef";
 
@@ -4523,7 +4820,7 @@ static const char* apzUltrix_IfdefPatch[] = {
  *
  *  Description of Ultrix_Math_Ifdef fix
  */
-#define ULTRIX_MATH_IFDEF_FIXIDX         112
+#define ULTRIX_MATH_IFDEF_FIXIDX         121
 tSCC zUltrix_Math_IfdefName[] =
      "ultrix_math_ifdef";
 
@@ -4559,7 +4856,7 @@ static const char* apzUltrix_Math_IfdefPatch[] = {
  *
  *  Description of Ultrix_Nested_Ioctl fix
  */
-#define ULTRIX_NESTED_IOCTL_FIXIDX       113
+#define ULTRIX_NESTED_IOCTL_FIXIDX       122
 tSCC zUltrix_Nested_IoctlName[] =
      "ultrix_nested_ioctl";
 
@@ -4594,7 +4891,7 @@ static const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
  *
  *  Description of Ultrix_Nested_Svc fix
  */
-#define ULTRIX_NESTED_SVC_FIXIDX         114
+#define ULTRIX_NESTED_SVC_FIXIDX         123
 tSCC zUltrix_Nested_SvcName[] =
      "ultrix_nested_svc";
 
@@ -4629,7 +4926,7 @@ static const char* apzUltrix_Nested_SvcPatch[] = { "sed",
  *
  *  Description of Ultrix_Stat fix
  */
-#define ULTRIX_STAT_FIXIDX               115
+#define ULTRIX_STAT_FIXIDX               124
 tSCC zUltrix_StatName[] =
      "ultrix_stat";
 
@@ -4660,8 +4957,7 @@ 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",
+#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)\\\n\n",
     "-e", "/^[ \t]*fstat(),$/a\\\n\
 \tlstat(),\n",
     (char*)NULL };
@@ -4670,7 +4966,7 @@ static const char* apzUltrix_StatPatch[] = { "sed",
  *
  *  Description of Ultrix_Static fix
  */
-#define ULTRIX_STATIC_FIXIDX             116
+#define ULTRIX_STATIC_FIXIDX             125
 tSCC zUltrix_StaticName[] =
      "ultrix_static";
 
@@ -4707,7 +5003,7 @@ static const char* apzUltrix_StaticPatch[] = { "sed",
  *
  *  Description of Ultrix_Strings fix
  */
-#define ULTRIX_STRINGS_FIXIDX            117
+#define ULTRIX_STRINGS_FIXIDX            126
 tSCC zUltrix_StringsName[] =
      "ultrix_strings";
 
@@ -4742,7 +5038,7 @@ static const char* apzUltrix_StringsPatch[] = {
  *
  *  Description of Undefine_Null fix
  */
-#define UNDEFINE_NULL_FIXIDX             118
+#define UNDEFINE_NULL_FIXIDX             127
 tSCC zUndefine_NullName[] =
      "undefine_null";
 
@@ -4788,7 +5084,7 @@ static const char* apzUndefine_NullPatch[] = {
  *
  *  Description of Uw7_Byteorder_Fix fix
  */
-#define UW7_BYTEORDER_FIX_FIXIDX         119
+#define UW7_BYTEORDER_FIX_FIXIDX         128
 tSCC zUw7_Byteorder_FixName[] =
      "uw7_byteorder_fix";
 
@@ -4839,7 +5135,7 @@ static const char* apzUw7_Byteorder_FixPatch[] = {
  *
  *  Description of Va_I960_Macro fix
  */
-#define VA_I960_MACRO_FIXIDX             120
+#define VA_I960_MACRO_FIXIDX             129
 tSCC zVa_I960_MacroName[] =
      "va_i960_macro";
 
@@ -4875,7 +5171,7 @@ static const char* apzVa_I960_MacroPatch[] = {
  *
  *  Description of Void_Null fix
  */
-#define VOID_NULL_FIXIDX                 121
+#define VOID_NULL_FIXIDX                 130
 tSCC zVoid_NullName[] =
      "void_null";
 
@@ -4911,7 +5207,7 @@ static const char* apzVoid_NullPatch[] = {
  *
  *  Description of Vxworks_Gcc_Problem fix
  */
-#define VXWORKS_GCC_PROBLEM_FIXIDX       122
+#define VXWORKS_GCC_PROBLEM_FIXIDX       131
 tSCC zVxworks_Gcc_ProblemName[] =
      "vxworks_gcc_problem";
 
@@ -4961,7 +5257,7 @@ static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
  *
  *  Description of Vxworks_Needs_Vxtypes fix
  */
-#define VXWORKS_NEEDS_VXTYPES_FIXIDX     123
+#define VXWORKS_NEEDS_VXTYPES_FIXIDX     132
 tSCC zVxworks_Needs_VxtypesName[] =
      "vxworks_needs_vxtypes";
 
@@ -4997,7 +5293,7 @@ static const char* apzVxworks_Needs_VxtypesPatch[] = {
  *
  *  Description of Vxworks_Needs_Vxworks fix
  */
-#define VXWORKS_NEEDS_VXWORKS_FIXIDX     124
+#define VXWORKS_NEEDS_VXWORKS_FIXIDX     133
 tSCC zVxworks_Needs_VxworksName[] =
      "vxworks_needs_vxworks";
 
@@ -5046,7 +5342,7 @@ static const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
  *
  *  Description of Vxworks_Time fix
  */
-#define VXWORKS_TIME_FIXIDX              125
+#define VXWORKS_TIME_FIXIDX              134
 tSCC zVxworks_TimeName[] =
      "vxworks_time";
 
@@ -5097,7 +5393,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\
  *
  *  Description of X11_Class fix
  */
-#define X11_CLASS_FIXIDX                 126
+#define X11_CLASS_FIXIDX                 135
 tSCC zX11_ClassName[] =
      "x11_class";
 
@@ -5144,7 +5440,7 @@ static const char* apzX11_ClassPatch[] = {
  *
  *  Description of X11_Class_Usage fix
  */
-#define X11_CLASS_USAGE_FIXIDX           127
+#define X11_CLASS_USAGE_FIXIDX           136
 tSCC zX11_Class_UsageName[] =
      "x11_class_usage";
 
@@ -5187,7 +5483,7 @@ static const char* apzX11_Class_UsagePatch[] = {
  *
  *  Description of X11_New fix
  */
-#define X11_NEW_FIXIDX                   128
+#define X11_NEW_FIXIDX                   137
 tSCC zX11_NewName[] =
      "x11_new";
 
@@ -5228,7 +5524,7 @@ static const char* apzX11_NewPatch[] = { "sed",
  *
  *  Description of X11_Sprintf fix
  */
-#define X11_SPRINTF_FIXIDX               129
+#define X11_SPRINTF_FIXIDX               138
 tSCC zX11_SprintfName[] =
      "x11_sprintf";
 
@@ -5267,658 +5563,703 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          134
+#define REGEX_COUNT          146
 #define MACH_LIST_SIZE_LIMIT 279
-#define FIX_COUNT            130
+#define FIX_COUNT            139
 
 tFixDesc fixDescList[ FIX_COUNT ] = {
   {  zAaa_Ki_IfaceName,    zAaa_Ki_IfaceList,
      apzAaa_Ki_IfaceMachs,
      AAA_KI_IFACE_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_Ki_IfaceTests,   apzAaa_Ki_IfacePatch },
+     aAaa_Ki_IfaceTests,   apzAaa_Ki_IfacePatch, 0 },
 
   {  zAaa_KiName,    zAaa_KiList,
      apzAaa_KiMachs,
      AAA_KI_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_KiTests,   apzAaa_KiPatch },
+     aAaa_KiTests,   apzAaa_KiPatch, 0 },
 
   {  zAaa_Ki_CallsName,    zAaa_Ki_CallsList,
      apzAaa_Ki_CallsMachs,
      AAA_KI_CALLS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_Ki_CallsTests,   apzAaa_Ki_CallsPatch },
+     aAaa_Ki_CallsTests,   apzAaa_Ki_CallsPatch, 0 },
 
   {  zAaa_Ki_DefsName,    zAaa_Ki_DefsList,
      apzAaa_Ki_DefsMachs,
      AAA_KI_DEFS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_Ki_DefsTests,   apzAaa_Ki_DefsPatch },
+     aAaa_Ki_DefsTests,   apzAaa_Ki_DefsPatch, 0 },
+
+  {  zAaa_StandardsName,    zAaa_StandardsList,
+     apzAaa_StandardsMachs,
+     AAA_STANDARDS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+     aAaa_StandardsTests,   apzAaa_StandardsPatch, 0 },
 
   {  zAaa_Bad_FixesName,    zAaa_Bad_FixesList,
      apzAaa_Bad_FixesMachs,
      AAA_BAD_FIXES_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_Bad_FixesTests,   apzAaa_Bad_FixesPatch },
+     aAaa_Bad_FixesTests,   apzAaa_Bad_FixesPatch, 0 },
 
   {  zAaa_TimeName,    zAaa_TimeList,
      apzAaa_TimeMachs,
      AAA_TIME_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_TimeTests,   apzAaa_TimePatch },
+     aAaa_TimeTests,   apzAaa_TimePatch, 0 },
 
   {  zAab_Dgux_Int_VarargsName,    zAab_Dgux_Int_VarargsList,
      apzAab_Dgux_Int_VarargsMachs,
      AAB_DGUX_INT_VARARGS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Dgux_Int_VarargsTests,   apzAab_Dgux_Int_VarargsPatch },
+     aAab_Dgux_Int_VarargsTests,   apzAab_Dgux_Int_VarargsPatch, 0 },
 
   {  zAab_Fd_Zero_Asm_Posix_Types_HName,    zAab_Fd_Zero_Asm_Posix_Types_HList,
      apzAab_Fd_Zero_Asm_Posix_Types_HMachs,
      AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Fd_Zero_Asm_Posix_Types_HTests,   apzAab_Fd_Zero_Asm_Posix_Types_HPatch },
+     aAab_Fd_Zero_Asm_Posix_Types_HTests,   apzAab_Fd_Zero_Asm_Posix_Types_HPatch, 0 },
 
   {  zAab_Fd_Zero_Gnu_Types_HName,    zAab_Fd_Zero_Gnu_Types_HList,
      apzAab_Fd_Zero_Gnu_Types_HMachs,
      AAB_FD_ZERO_GNU_TYPES_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Fd_Zero_Gnu_Types_HTests,   apzAab_Fd_Zero_Gnu_Types_HPatch },
+     aAab_Fd_Zero_Gnu_Types_HTests,   apzAab_Fd_Zero_Gnu_Types_HPatch, 0 },
 
   {  zAab_Fd_Zero_Selectbits_HName,    zAab_Fd_Zero_Selectbits_HList,
      apzAab_Fd_Zero_Selectbits_HMachs,
      AAB_FD_ZERO_SELECTBITS_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Fd_Zero_Selectbits_HTests,   apzAab_Fd_Zero_Selectbits_HPatch },
+     aAab_Fd_Zero_Selectbits_HTests,   apzAab_Fd_Zero_Selectbits_HPatch, 0 },
 
   {  zAab_Sun_MemcpyName,    zAab_Sun_MemcpyList,
      apzAab_Sun_MemcpyMachs,
      AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Sun_MemcpyTests,   apzAab_Sun_MemcpyPatch },
+     aAab_Sun_MemcpyTests,   apzAab_Sun_MemcpyPatch, 0 },
 
   {  zAab_Svr4_Replace_ByteorderName,    zAab_Svr4_Replace_ByteorderList,
      apzAab_Svr4_Replace_ByteorderMachs,
      AAB_SVR4_REPLACE_BYTEORDER_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Svr4_Replace_ByteorderTests,   apzAab_Svr4_Replace_ByteorderPatch },
+     aAab_Svr4_Replace_ByteorderTests,   apzAab_Svr4_Replace_ByteorderPatch, 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 },
+     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 },
+     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 },
+     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 },
+     aAab_Ultrix_StringTests,   apzAab_Ultrix_StringPatch, 0 },
 
   {  zAix_PthreadName,    zAix_PthreadList,
      apzAix_PthreadMachs,
      AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAix_PthreadTests,   apzAix_PthreadPatch },
+     aAix_PthreadTests,   apzAix_PthreadPatch, 0 },
 
   {  zAix_SysmachineName,    zAix_SysmachineList,
      apzAix_SysmachineMachs,
      AIX_SYSMACHINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAix_SysmachineTests,   apzAix_SysmachinePatch },
+     aAix_SysmachineTests,   apzAix_SysmachinePatch, 0 },
 
   {  zAix_SyswaitName,    zAix_SyswaitList,
      apzAix_SyswaitMachs,
      AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAix_SyswaitTests,   apzAix_SyswaitPatch },
+     aAix_SyswaitTests,   apzAix_SyswaitPatch, 0 },
 
   {  zAix_VolatileName,    zAix_VolatileList,
      apzAix_VolatileMachs,
      AIX_VOLATILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAix_VolatileTests,   apzAix_VolatilePatch },
+     aAix_VolatileTests,   apzAix_VolatilePatch, 0 },
+
+  {  zAlpha___AssertName,    zAlpha___AssertList,
+     apzAlpha___AssertMachs,
+     ALPHA___ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAlpha___AssertTests,   apzAlpha___AssertPatch, 0 },
 
   {  zAlpha_GetoptName,    zAlpha_GetoptList,
      apzAlpha_GetoptMachs,
      ALPHA_GETOPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAlpha_GetoptTests,   apzAlpha_GetoptPatch },
+     aAlpha_GetoptTests,   apzAlpha_GetoptPatch, 0 },
 
   {  zAlpha_ParensName,    zAlpha_ParensList,
      apzAlpha_ParensMachs,
      ALPHA_PARENS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAlpha_ParensTests,   apzAlpha_ParensPatch },
+     aAlpha_ParensTests,   apzAlpha_ParensPatch, 0 },
 
   {  zAlpha_SbrkName,    zAlpha_SbrkList,
      apzAlpha_SbrkMachs,
      ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAlpha_SbrkTests,   apzAlpha_SbrkPatch },
+     aAlpha_SbrkTests,   apzAlpha_SbrkPatch, 0 },
 
   {  zArm_Norcroft_HintName,    zArm_Norcroft_HintList,
      apzArm_Norcroft_HintMachs,
      ARM_NORCROFT_HINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aArm_Norcroft_HintTests,   apzArm_Norcroft_HintPatch },
+     aArm_Norcroft_HintTests,   apzArm_Norcroft_HintPatch, 0 },
 
   {  zArm_WcharName,    zArm_WcharList,
      apzArm_WcharMachs,
      ARM_WCHAR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aArm_WcharTests,   apzArm_WcharPatch },
+     aArm_WcharTests,   apzArm_WcharPatch, 0 },
 
   {  zAux_AsmName,    zAux_AsmList,
      apzAux_AsmMachs,
      AUX_ASM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAux_AsmTests,   apzAux_AsmPatch },
+     aAux_AsmTests,   apzAux_AsmPatch, 0 },
 
   {  zAvoid_Bool_DefineName,    zAvoid_Bool_DefineList,
      apzAvoid_Bool_DefineMachs,
      AVOID_BOOL_DEFINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAvoid_Bool_DefineTests,   apzAvoid_Bool_DefinePatch },
+     aAvoid_Bool_DefineTests,   apzAvoid_Bool_DefinePatch, 0 },
 
   {  zAvoid_Bool_TypeName,    zAvoid_Bool_TypeList,
      apzAvoid_Bool_TypeMachs,
      AVOID_BOOL_TYPE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAvoid_Bool_TypeTests,   apzAvoid_Bool_TypePatch },
+     aAvoid_Bool_TypeTests,   apzAvoid_Bool_TypePatch, 0 },
 
   {  zAvoid_Wchar_T_TypeName,    zAvoid_Wchar_T_TypeList,
      apzAvoid_Wchar_T_TypeMachs,
      AVOID_WCHAR_T_TYPE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAvoid_Wchar_T_TypeTests,   apzAvoid_Wchar_T_TypePatch },
+     aAvoid_Wchar_T_TypeTests,   apzAvoid_Wchar_T_TypePatch, 0 },
 
   {  zBad_LvalName,    zBad_LvalList,
      apzBad_LvalMachs,
      BAD_LVAL_TEST_CT, FD_MACH_ONLY,
-     aBad_LvalTests,   apzBad_LvalPatch },
+     aBad_LvalTests,   apzBad_LvalPatch, 0 },
 
   {  zBad_Struct_TermName,    zBad_Struct_TermList,
      apzBad_Struct_TermMachs,
      BAD_STRUCT_TERM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aBad_Struct_TermTests,   apzBad_Struct_TermPatch },
+     aBad_Struct_TermTests,   apzBad_Struct_TermPatch, 0 },
 
   {  zBadquoteName,    zBadquoteList,
      apzBadquoteMachs,
      BADQUOTE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aBadquoteTests,   apzBadquotePatch },
+     aBadquoteTests,   apzBadquotePatch, 0 },
 
   {  zBroken_Assert_StdioName,    zBroken_Assert_StdioList,
      apzBroken_Assert_StdioMachs,
      BROKEN_ASSERT_STDIO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aBroken_Assert_StdioTests,   apzBroken_Assert_StdioPatch },
+     aBroken_Assert_StdioTests,   apzBroken_Assert_StdioPatch, 0 },
 
   {  zBroken_Assert_StdlibName,    zBroken_Assert_StdlibList,
      apzBroken_Assert_StdlibMachs,
      BROKEN_ASSERT_STDLIB_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aBroken_Assert_StdlibTests,   apzBroken_Assert_StdlibPatch },
+     aBroken_Assert_StdlibTests,   apzBroken_Assert_StdlibPatch, 0 },
 
   {  zBroken_CabsName,    zBroken_CabsList,
      apzBroken_CabsMachs,
      BROKEN_CABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aBroken_CabsTests,   apzBroken_CabsPatch },
+     aBroken_CabsTests,   apzBroken_CabsPatch, 0 },
 
   {  zCtrl_Quotes_DefName,    zCtrl_Quotes_DefList,
      apzCtrl_Quotes_DefMachs,
      CTRL_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aCtrl_Quotes_DefTests,   apzCtrl_Quotes_DefPatch },
+     aCtrl_Quotes_DefTests,   apzCtrl_Quotes_DefPatch, 0 },
 
   {  zCtrl_Quotes_UseName,    zCtrl_Quotes_UseList,
      apzCtrl_Quotes_UseMachs,
      CTRL_QUOTES_USE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aCtrl_Quotes_UseTests,   apzCtrl_Quotes_UsePatch },
+     aCtrl_Quotes_UseTests,   apzCtrl_Quotes_UsePatch, 0 },
 
   {  zCxx_UnreadyName,    zCxx_UnreadyList,
      apzCxx_UnreadyMachs,
      CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aCxx_UnreadyTests,   apzCxx_UnreadyPatch },
+     aCxx_UnreadyTests,   apzCxx_UnreadyPatch, 0 },
 
   {  zDec_Intern_AsmName,    zDec_Intern_AsmList,
      apzDec_Intern_AsmMachs,
      DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
-     aDec_Intern_AsmTests,   apzDec_Intern_AsmPatch },
+     aDec_Intern_AsmTests,   apzDec_Intern_AsmPatch, 0 },
+
+  {  zDjgpp_Wchar_HName,    zDjgpp_Wchar_HList,
+     apzDjgpp_Wchar_HMachs,
+     DJGPP_WCHAR_H_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDjgpp_Wchar_HTests,   apzDjgpp_Wchar_HPatch, 0 },
 
   {  zEcd_CursorName,    zEcd_CursorList,
      apzEcd_CursorMachs,
      ECD_CURSOR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aEcd_CursorTests,   apzEcd_CursorPatch },
+     aEcd_CursorTests,   apzEcd_CursorPatch, 0 },
 
   {  zFix_Header_BreakageName,    zFix_Header_BreakageList,
      apzFix_Header_BreakageMachs,
      FIX_HEADER_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aFix_Header_BreakageTests,   apzFix_Header_BreakagePatch },
+     aFix_Header_BreakageTests,   apzFix_Header_BreakagePatch, 0 },
+
+  {  zFreebsd_Gcc3_BreakageName,    zFreebsd_Gcc3_BreakageList,
+     apzFreebsd_Gcc3_BreakageMachs,
+     FREEBSD_GCC3_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aFreebsd_Gcc3_BreakageTests,   apzFreebsd_Gcc3_BreakagePatch, 0 },
 
   {  zHp_InlineName,    zHp_InlineList,
      apzHp_InlineMachs,
      HP_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHp_InlineTests,   apzHp_InlinePatch },
+     aHp_InlineTests,   apzHp_InlinePatch, 0 },
 
   {  zHp_SysfileName,    zHp_SysfileList,
      apzHp_SysfileMachs,
      HP_SYSFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHp_SysfileTests,   apzHp_SysfilePatch },
+     aHp_SysfileTests,   apzHp_SysfilePatch, 0 },
 
   {  zHpux11_FabsfName,    zHpux11_FabsfList,
      apzHpux11_FabsfMachs,
      HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_FabsfTests,   apzHpux11_FabsfPatch },
+     aHpux11_FabsfTests,   apzHpux11_FabsfPatch, 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 },
+     aHpux11_Uint32_CTests,   apzHpux11_Uint32_CPatch, 0 },
 
   {  zHpux8_Bogus_InlinesName,    zHpux8_Bogus_InlinesList,
      apzHpux8_Bogus_InlinesMachs,
      HPUX8_BOGUS_INLINES_TEST_CT, FD_MACH_ONLY,
-     aHpux8_Bogus_InlinesTests,   apzHpux8_Bogus_InlinesPatch },
+     aHpux8_Bogus_InlinesTests,   apzHpux8_Bogus_InlinesPatch, 0 },
 
   {  zInt_Abort_Free_And_ExitName,    zInt_Abort_Free_And_ExitList,
      apzInt_Abort_Free_And_ExitMachs,
      INT_ABORT_FREE_AND_EXIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aInt_Abort_Free_And_ExitTests,   apzInt_Abort_Free_And_ExitPatch },
+     aInt_Abort_Free_And_ExitTests,   apzInt_Abort_Free_And_ExitPatch, 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 },
+     aIsc_Omits_With_StdcTests,   apzIsc_Omits_With_StdcPatch, 0 },
 
   {  zIo_Quotes_DefName,    zIo_Quotes_DefList,
      apzIo_Quotes_DefMachs,
      IO_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIo_Quotes_DefTests,   apzIo_Quotes_DefPatch },
+     aIo_Quotes_DefTests,   apzIo_Quotes_DefPatch, 0 },
 
   {  zIo_Quotes_UseName,    zIo_Quotes_UseList,
      apzIo_Quotes_UseMachs,
      IO_QUOTES_USE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIo_Quotes_UseTests,   apzIo_Quotes_UsePatch },
+     aIo_Quotes_UseTests,   apzIo_Quotes_UsePatch, 0 },
 
   {  zHpux_MaxintName,    zHpux_MaxintList,
      apzHpux_MaxintMachs,
      HPUX_MAXINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_MaxintTests,   apzHpux_MaxintPatch },
+     aHpux_MaxintTests,   apzHpux_MaxintPatch, 0 },
 
   {  zHpux_SystimeName,    zHpux_SystimeList,
      apzHpux_SystimeMachs,
      HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_SystimeTests,   apzHpux_SystimePatch },
+     aHpux_SystimeTests,   apzHpux_SystimePatch, 0 },
 
   {  zIp_Missing_SemiName,    zIp_Missing_SemiList,
      apzIp_Missing_SemiMachs,
      IP_MISSING_SEMI_TEST_CT, FD_MACH_ONLY,
-     aIp_Missing_SemiTests,   apzIp_Missing_SemiPatch },
+     aIp_Missing_SemiTests,   apzIp_Missing_SemiPatch, 0 },
 
   {  zIrix_Asm_ApostropheName,    zIrix_Asm_ApostropheList,
      apzIrix_Asm_ApostropheMachs,
      IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix_Asm_ApostropheTests,   apzIrix_Asm_ApostrophePatch },
+     aIrix_Asm_ApostropheTests,   apzIrix_Asm_ApostrophePatch, 0 },
+
+  {  zIrix_Stdio_Va_ListName,    zIrix_Stdio_Va_ListList,
+     apzIrix_Stdio_Va_ListMachs,
+     IRIX_STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aIrix_Stdio_Va_ListTests,   apzIrix_Stdio_Va_ListPatch, 0 },
+
+  {  zIrix_Limits_ConstName,    zIrix_Limits_ConstList,
+     apzIrix_Limits_ConstMachs,
+     IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aIrix_Limits_ConstTests,   apzIrix_Limits_ConstPatch, 0 },
 
   {  zIsc_FmodName,    zIsc_FmodList,
      apzIsc_FmodMachs,
      ISC_FMOD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIsc_FmodTests,   apzIsc_FmodPatch },
+     aIsc_FmodTests,   apzIsc_FmodPatch, 0 },
 
   {  zKandr_ConcatName,    zKandr_ConcatList,
      apzKandr_ConcatMachs,
      KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aKandr_ConcatTests,   apzKandr_ConcatPatch },
+     aKandr_ConcatTests,   apzKandr_ConcatPatch, 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 },
+     aLibc1_Ifdefd_MemxTests,   apzLibc1_Ifdefd_MemxPatch, 0 },
 
   {  zLimits_IfndefsName,    zLimits_IfndefsList,
      apzLimits_IfndefsMachs,
      LIMITS_IFNDEFS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aLimits_IfndefsTests,   apzLimits_IfndefsPatch },
+     aLimits_IfndefsTests,   apzLimits_IfndefsPatch, 0 },
 
   {  zLynx_Void_IntName,    zLynx_Void_IntList,
      apzLynx_Void_IntMachs,
      LYNX_VOID_INT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aLynx_Void_IntTests,   apzLynx_Void_IntPatch },
+     aLynx_Void_IntTests,   apzLynx_Void_IntPatch, 0 },
 
   {  zLynxos_Fcntl_ProtoName,    zLynxos_Fcntl_ProtoList,
      apzLynxos_Fcntl_ProtoMachs,
      LYNXOS_FCNTL_PROTO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aLynxos_Fcntl_ProtoTests,   apzLynxos_Fcntl_ProtoPatch },
+     aLynxos_Fcntl_ProtoTests,   apzLynxos_Fcntl_ProtoPatch, 0 },
 
   {  zM88k_Bad_Hypot_OptName,    zM88k_Bad_Hypot_OptList,
      apzM88k_Bad_Hypot_OptMachs,
      M88K_BAD_HYPOT_OPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aM88k_Bad_Hypot_OptTests,   apzM88k_Bad_Hypot_OptPatch },
+     aM88k_Bad_Hypot_OptTests,   apzM88k_Bad_Hypot_OptPatch, 0 },
 
   {  zM88k_Bad_S_IfName,    zM88k_Bad_S_IfList,
      apzM88k_Bad_S_IfMachs,
      M88K_BAD_S_IF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aM88k_Bad_S_IfTests,   apzM88k_Bad_S_IfPatch },
+     aM88k_Bad_S_IfTests,   apzM88k_Bad_S_IfPatch, 0 },
 
   {  zM88k_Multi_InclName,    zM88k_Multi_InclList,
      apzM88k_Multi_InclMachs,
      M88K_MULTI_INCL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aM88k_Multi_InclTests,   apzM88k_Multi_InclPatch },
+     aM88k_Multi_InclTests,   apzM88k_Multi_InclPatch, 0 },
 
   {  zMachine_Ansi_H_Va_ListName,    zMachine_Ansi_H_Va_ListList,
      apzMachine_Ansi_H_Va_ListMachs,
      MACHINE_ANSI_H_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aMachine_Ansi_H_Va_ListTests,   apzMachine_Ansi_H_Va_ListPatch },
+     aMachine_Ansi_H_Va_ListTests,   apzMachine_Ansi_H_Va_ListPatch, 0 },
 
   {  zMachine_NameName,    zMachine_NameList,
      apzMachine_NameMachs,
      MACHINE_NAME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aMachine_NameTests,   apzMachine_NamePatch },
+     aMachine_NameTests,   apzMachine_NamePatch, 0 },
 
   {  zMath_ExceptionName,    zMath_ExceptionList,
      apzMath_ExceptionMachs,
      MATH_EXCEPTION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aMath_ExceptionTests,   apzMath_ExceptionPatch },
+     aMath_ExceptionTests,   apzMath_ExceptionPatch, 0 },
 
   {  zMath_Huge_Val_From_Dbl_MaxName,    zMath_Huge_Val_From_Dbl_MaxList,
      apzMath_Huge_Val_From_Dbl_MaxMachs,
      MATH_HUGE_VAL_FROM_DBL_MAX_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
-     aMath_Huge_Val_From_Dbl_MaxTests,   apzMath_Huge_Val_From_Dbl_MaxPatch },
+     aMath_Huge_Val_From_Dbl_MaxTests,   apzMath_Huge_Val_From_Dbl_MaxPatch, 0 },
 
   {  zMath_Huge_Val_IfndefName,    zMath_Huge_Val_IfndefList,
      apzMath_Huge_Val_IfndefMachs,
      MATH_HUGE_VAL_IFNDEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aMath_Huge_Val_IfndefTests,   apzMath_Huge_Val_IfndefPatch },
+     aMath_Huge_Val_IfndefTests,   apzMath_Huge_Val_IfndefPatch, 0 },
 
   {  zNested_MotorolaName,    zNested_MotorolaList,
      apzNested_MotorolaMachs,
      NESTED_MOTOROLA_TEST_CT, FD_MACH_ONLY,
-     aNested_MotorolaTests,   apzNested_MotorolaPatch },
+     aNested_MotorolaTests,   apzNested_MotorolaPatch, 0 },
 
   {  zNested_Sys_LimitsName,    zNested_Sys_LimitsList,
      apzNested_Sys_LimitsMachs,
      NESTED_SYS_LIMITS_TEST_CT, FD_MACH_ONLY,
-     aNested_Sys_LimitsTests,   apzNested_Sys_LimitsPatch },
+     aNested_Sys_LimitsTests,   apzNested_Sys_LimitsPatch, 0 },
 
   {  zNested_Auth_DesName,    zNested_Auth_DesList,
      apzNested_Auth_DesMachs,
      NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aNested_Auth_DesTests,   apzNested_Auth_DesPatch },
+     aNested_Auth_DesTests,   apzNested_Auth_DesPatch, 0 },
 
   {  zNews_Os_RecursionName,    zNews_Os_RecursionList,
      apzNews_Os_RecursionMachs,
      NEWS_OS_RECURSION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aNews_Os_RecursionTests,   apzNews_Os_RecursionPatch },
+     aNews_Os_RecursionTests,   apzNews_Os_RecursionPatch, 0 },
 
   {  zNext_Math_PrefixName,    zNext_Math_PrefixList,
      apzNext_Math_PrefixMachs,
      NEXT_MATH_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aNext_Math_PrefixTests,   apzNext_Math_PrefixPatch },
+     aNext_Math_PrefixTests,   apzNext_Math_PrefixPatch, 0 },
 
   {  zNext_TemplateName,    zNext_TemplateList,
      apzNext_TemplateMachs,
      NEXT_TEMPLATE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aNext_TemplateTests,   apzNext_TemplatePatch },
+     aNext_TemplateTests,   apzNext_TemplatePatch, 0 },
 
   {  zNext_VolitileName,    zNext_VolitileList,
      apzNext_VolitileMachs,
      NEXT_VOLITILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aNext_VolitileTests,   apzNext_VolitilePatch },
+     aNext_VolitileTests,   apzNext_VolitilePatch, 0 },
 
   {  zNext_Wait_UnionName,    zNext_Wait_UnionList,
      apzNext_Wait_UnionMachs,
      NEXT_WAIT_UNION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aNext_Wait_UnionTests,   apzNext_Wait_UnionPatch },
+     aNext_Wait_UnionTests,   apzNext_Wait_UnionPatch, 0 },
 
   {  zNodeent_SyntaxName,    zNodeent_SyntaxList,
      apzNodeent_SyntaxMachs,
      NODEENT_SYNTAX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aNodeent_SyntaxTests,   apzNodeent_SyntaxPatch },
+     aNodeent_SyntaxTests,   apzNodeent_SyntaxPatch, 0 },
 
   {  zOsf_Namespace_AName,    zOsf_Namespace_AList,
      apzOsf_Namespace_AMachs,
      OSF_NAMESPACE_A_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aOsf_Namespace_ATests,   apzOsf_Namespace_APatch },
+     aOsf_Namespace_ATests,   apzOsf_Namespace_APatch, 0 },
 
   {  zOsf_Namespace_CName,    zOsf_Namespace_CList,
      apzOsf_Namespace_CMachs,
      OSF_NAMESPACE_C_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aOsf_Namespace_CTests,   apzOsf_Namespace_CPatch },
+     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 },
+     aPthread_Page_SizeTests,   apzPthread_Page_SizePatch, 0 },
 
   {  zRead_Ret_TypeName,    zRead_Ret_TypeList,
      apzRead_Ret_TypeMachs,
      READ_RET_TYPE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aRead_Ret_TypeTests,   apzRead_Ret_TypePatch },
+     aRead_Ret_TypeTests,   apzRead_Ret_TypePatch, 0 },
 
   {  zRs6000_DoubleName,    zRs6000_DoubleList,
      apzRs6000_DoubleMachs,
      RS6000_DOUBLE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aRs6000_DoubleTests,   apzRs6000_DoublePatch },
+     aRs6000_DoubleTests,   apzRs6000_DoublePatch, 0 },
 
   {  zRs6000_FchmodName,    zRs6000_FchmodList,
      apzRs6000_FchmodMachs,
      RS6000_FCHMOD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aRs6000_FchmodTests,   apzRs6000_FchmodPatch },
+     aRs6000_FchmodTests,   apzRs6000_FchmodPatch, 0 },
 
   {  zRs6000_ParamName,    zRs6000_ParamList,
      apzRs6000_ParamMachs,
      RS6000_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aRs6000_ParamTests,   apzRs6000_ParamPatch },
+     aRs6000_ParamTests,   apzRs6000_ParamPatch, 0 },
 
   {  zSco_Static_FuncName,    zSco_Static_FuncList,
      apzSco_Static_FuncMachs,
      SCO_STATIC_FUNC_TEST_CT, FD_MACH_ONLY,
-     aSco_Static_FuncTests,   apzSco_Static_FuncPatch },
+     aSco_Static_FuncTests,   apzSco_Static_FuncPatch, 0 },
 
-  {  zSco_Strict_AnsiName,    zSco_Strict_AnsiList,
-     apzSco_Strict_AnsiMachs,
-     SCO_STRICT_ANSI_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSco_Strict_AnsiTests,   apzSco_Strict_AnsiPatch },
+  {  zStrict_Ansi_NotName,    zStrict_Ansi_NotList,
+     apzStrict_Ansi_NotMachs,
+     STRICT_ANSI_NOT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aStrict_Ansi_NotTests,   apzStrict_Ansi_NotPatch, 0 },
+
+  {  zStrict_Ansi_Not_CtdName,    zStrict_Ansi_Not_CtdList,
+     apzStrict_Ansi_Not_CtdMachs,
+     STRICT_ANSI_NOT_CTD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aStrict_Ansi_Not_CtdTests,   apzStrict_Ansi_Not_CtdPatch, 0 },
+
+  {  zStrict_Ansi_OnlyName,    zStrict_Ansi_OnlyList,
+     apzStrict_Ansi_OnlyMachs,
+     STRICT_ANSI_ONLY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aStrict_Ansi_OnlyTests,   apzStrict_Ansi_OnlyPatch, 0 },
 
   {  zSco_UtimeName,    zSco_UtimeList,
      apzSco_UtimeMachs,
      SCO_UTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSco_UtimeTests,   apzSco_UtimePatch },
+     aSco_UtimeTests,   apzSco_UtimePatch, 0 },
+
+  {  zSolaris27_Mutex_InitName,    zSolaris27_Mutex_InitList,
+     apzSolaris27_Mutex_InitMachs,
+     SOLARIS27_MUTEX_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris27_Mutex_InitTests,   apzSolaris27_Mutex_InitPatch, 0 },
 
   {  zStatsswtchName,    zStatsswtchList,
      apzStatsswtchMachs,
      STATSSWTCH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aStatsswtchTests,   apzStatsswtchPatch },
+     aStatsswtchTests,   apzStatsswtchPatch, 0 },
 
   {  zStdio_Stdarg_HName,    zStdio_Stdarg_HList,
      apzStdio_Stdarg_HMachs,
      STDIO_STDARG_H_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aStdio_Stdarg_HTests,   apzStdio_Stdarg_HPatch },
+     aStdio_Stdarg_HTests,   apzStdio_Stdarg_HPatch, 0 },
 
   {  zStdio_Va_ListName,    zStdio_Va_ListList,
      apzStdio_Va_ListMachs,
      STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY,
-     aStdio_Va_ListTests,   apzStdio_Va_ListPatch },
+     aStdio_Va_ListTests,   apzStdio_Va_ListPatch, 0 },
 
   {  zStruct_FileName,    zStruct_FileList,
      apzStruct_FileMachs,
      STRUCT_FILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aStruct_FileTests,   apzStruct_FilePatch },
+     aStruct_FileTests,   apzStruct_FilePatch, 0 },
 
   {  zStruct_SockaddrName,    zStruct_SockaddrList,
      apzStruct_SockaddrMachs,
      STRUCT_SOCKADDR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aStruct_SockaddrTests,   apzStruct_SockaddrPatch },
+     aStruct_SockaddrTests,   apzStruct_SockaddrPatch, 0 },
 
   {  zSun_Auth_ProtoName,    zSun_Auth_ProtoList,
      apzSun_Auth_ProtoMachs,
      SUN_AUTH_PROTO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSun_Auth_ProtoTests,   apzSun_Auth_ProtoPatch },
+     aSun_Auth_ProtoTests,   apzSun_Auth_ProtoPatch, 0 },
 
   {  zSun_Bogus_IfdefName,    zSun_Bogus_IfdefList,
      apzSun_Bogus_IfdefMachs,
      SUN_BOGUS_IFDEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSun_Bogus_IfdefTests,   apzSun_Bogus_IfdefPatch },
+     aSun_Bogus_IfdefTests,   apzSun_Bogus_IfdefPatch, 0 },
 
   {  zSun_CatmacroName,    zSun_CatmacroList,
      apzSun_CatmacroMachs,
      SUN_CATMACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSun_CatmacroTests,   apzSun_CatmacroPatch },
+     aSun_CatmacroTests,   apzSun_CatmacroPatch, 0 },
 
   {  zSun_MallocName,    zSun_MallocList,
      apzSun_MallocMachs,
      SUN_MALLOC_TEST_CT, FD_MACH_ONLY,
-     aSun_MallocTests,   apzSun_MallocPatch },
+     aSun_MallocTests,   apzSun_MallocPatch, 0 },
 
   {  zSun_Rusers_SemiName,    zSun_Rusers_SemiList,
      apzSun_Rusers_SemiMachs,
      SUN_RUSERS_SEMI_TEST_CT, FD_MACH_ONLY,
-     aSun_Rusers_SemiTests,   apzSun_Rusers_SemiPatch },
+     aSun_Rusers_SemiTests,   apzSun_Rusers_SemiPatch, 0 },
 
   {  zSun_SignalName,    zSun_SignalList,
      apzSun_SignalMachs,
      SUN_SIGNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSun_SignalTests,   apzSun_SignalPatch },
+     aSun_SignalTests,   apzSun_SignalPatch, 0 },
 
   {  zSunos_Matherr_DeclName,    zSunos_Matherr_DeclList,
      apzSunos_Matherr_DeclMachs,
      SUNOS_MATHERR_DECL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSunos_Matherr_DeclTests,   apzSunos_Matherr_DeclPatch },
+     aSunos_Matherr_DeclTests,   apzSunos_Matherr_DeclPatch, 0 },
 
   {  zSunos_StrlenName,    zSunos_StrlenList,
      apzSunos_StrlenMachs,
      SUNOS_STRLEN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSunos_StrlenTests,   apzSunos_StrlenPatch },
+     aSunos_StrlenTests,   apzSunos_StrlenPatch, 0 },
 
   {  zSvr4__PName,    zSvr4__PList,
      apzSvr4__PMachs,
      SVR4__P_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSvr4__PTests,   apzSvr4__PPatch },
+     aSvr4__PTests,   apzSvr4__PPatch, 0 },
 
   {  zSvr4_GetcwdName,    zSvr4_GetcwdList,
      apzSvr4_GetcwdMachs,
      SVR4_GETCWD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSvr4_GetcwdTests,   apzSvr4_GetcwdPatch },
+     aSvr4_GetcwdTests,   apzSvr4_GetcwdPatch, 0 },
 
   {  zSvr4_ProfilName,    zSvr4_ProfilList,
      apzSvr4_ProfilMachs,
      SVR4_PROFIL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSvr4_ProfilTests,   apzSvr4_ProfilPatch },
+     aSvr4_ProfilTests,   apzSvr4_ProfilPatch, 0 },
 
   {  zGnu_TypesName,    zGnu_TypesList,
      apzGnu_TypesMachs,
      GNU_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aGnu_TypesTests,   apzGnu_TypesPatch },
+     aGnu_TypesTests,   apzGnu_TypesPatch, 0 },
 
   {  zSysv68_StringName,    zSysv68_StringList,
      apzSysv68_StringMachs,
      SYSV68_STRING_TEST_CT, FD_MACH_ONLY,
-     aSysv68_StringTests,   apzSysv68_StringPatch },
+     aSysv68_StringTests,   apzSysv68_StringPatch, 0 },
 
   {  zSysz_Stdlib_For_SunName,    zSysz_Stdlib_For_SunList,
      apzSysz_Stdlib_For_SunMachs,
      SYSZ_STDLIB_FOR_SUN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSysz_Stdlib_For_SunTests,   apzSysz_Stdlib_For_SunPatch },
+     aSysz_Stdlib_For_SunTests,   apzSysz_Stdlib_For_SunPatch, 0 },
 
   {  zTinfo_CplusplusName,    zTinfo_CplusplusList,
      apzTinfo_CplusplusMachs,
      TINFO_CPLUSPLUS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aTinfo_CplusplusTests,   apzTinfo_CplusplusPatch },
+     aTinfo_CplusplusTests,   apzTinfo_CplusplusPatch, 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 },
+     aUltrix_Atof_ParamTests,   apzUltrix_Atof_ParamPatch, 0 },
 
   {  zUltrix_ConstName,    zUltrix_ConstList,
      apzUltrix_ConstMachs,
      ULTRIX_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_ConstTests,   apzUltrix_ConstPatch },
+     aUltrix_ConstTests,   apzUltrix_ConstPatch, 0 },
 
   {  zUltrix_Const2Name,    zUltrix_Const2List,
      apzUltrix_Const2Machs,
      ULTRIX_CONST2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_Const2Tests,   apzUltrix_Const2Patch },
+     aUltrix_Const2Tests,   apzUltrix_Const2Patch, 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 },
+     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 },
+     aUltrix_IfdefTests,   apzUltrix_IfdefPatch, 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 },
+     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 },
+     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 },
+     aUltrix_Nested_SvcTests,   apzUltrix_Nested_SvcPatch, 0 },
 
   {  zUltrix_StatName,    zUltrix_StatList,
      apzUltrix_StatMachs,
      ULTRIX_STAT_TEST_CT, FD_MACH_ONLY,
-     aUltrix_StatTests,   apzUltrix_StatPatch },
+     aUltrix_StatTests,   apzUltrix_StatPatch, 0 },
 
   {  zUltrix_StaticName,    zUltrix_StaticList,
      apzUltrix_StaticMachs,
      ULTRIX_STATIC_TEST_CT, FD_MACH_ONLY,
-     aUltrix_StaticTests,   apzUltrix_StaticPatch },
+     aUltrix_StaticTests,   apzUltrix_StaticPatch, 0 },
 
   {  zUltrix_StringsName,    zUltrix_StringsList,
      apzUltrix_StringsMachs,
      ULTRIX_STRINGS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_StringsTests,   apzUltrix_StringsPatch },
+     aUltrix_StringsTests,   apzUltrix_StringsPatch, 0 },
 
   {  zUndefine_NullName,    zUndefine_NullList,
      apzUndefine_NullMachs,
      UNDEFINE_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUndefine_NullTests,   apzUndefine_NullPatch },
+     aUndefine_NullTests,   apzUndefine_NullPatch, 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 },
+     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,
-     aVa_I960_MacroTests,   apzVa_I960_MacroPatch },
+     aVa_I960_MacroTests,   apzVa_I960_MacroPatch, 0 },
 
   {  zVoid_NullName,    zVoid_NullList,
      apzVoid_NullMachs,
      VOID_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aVoid_NullTests,   apzVoid_NullPatch },
+     aVoid_NullTests,   apzVoid_NullPatch, 0 },
 
   {  zVxworks_Gcc_ProblemName,    zVxworks_Gcc_ProblemList,
      apzVxworks_Gcc_ProblemMachs,
      VXWORKS_GCC_PROBLEM_TEST_CT, FD_MACH_ONLY,
-     aVxworks_Gcc_ProblemTests,   apzVxworks_Gcc_ProblemPatch },
+     aVxworks_Gcc_ProblemTests,   apzVxworks_Gcc_ProblemPatch, 0 },
 
   {  zVxworks_Needs_VxtypesName,    zVxworks_Needs_VxtypesList,
      apzVxworks_Needs_VxtypesMachs,
      VXWORKS_NEEDS_VXTYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aVxworks_Needs_VxtypesTests,   apzVxworks_Needs_VxtypesPatch },
+     aVxworks_Needs_VxtypesTests,   apzVxworks_Needs_VxtypesPatch, 0 },
 
   {  zVxworks_Needs_VxworksName,    zVxworks_Needs_VxworksList,
      apzVxworks_Needs_VxworksMachs,
      VXWORKS_NEEDS_VXWORKS_TEST_CT, FD_MACH_ONLY,
-     aVxworks_Needs_VxworksTests,   apzVxworks_Needs_VxworksPatch },
+     aVxworks_Needs_VxworksTests,   apzVxworks_Needs_VxworksPatch, 0 },
 
   {  zVxworks_TimeName,    zVxworks_TimeList,
      apzVxworks_TimeMachs,
      VXWORKS_TIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aVxworks_TimeTests,   apzVxworks_TimePatch },
+     aVxworks_TimeTests,   apzVxworks_TimePatch, 0 },
 
   {  zX11_ClassName,    zX11_ClassList,
      apzX11_ClassMachs,
      X11_CLASS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aX11_ClassTests,   apzX11_ClassPatch },
+     aX11_ClassTests,   apzX11_ClassPatch, 0 },
 
   {  zX11_Class_UsageName,    zX11_Class_UsageList,
      apzX11_Class_UsageMachs,
      X11_CLASS_USAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aX11_Class_UsageTests,   apzX11_Class_UsagePatch },
+     aX11_Class_UsageTests,   apzX11_Class_UsagePatch, 0 },
 
   {  zX11_NewName,    zX11_NewList,
      apzX11_NewMachs,
      X11_NEW_TEST_CT, FD_MACH_ONLY,
-     aX11_NewTests,   apzX11_NewPatch },
+     aX11_NewTests,   apzX11_NewPatch, 0 },
 
   {  zX11_SprintfName,    zX11_SprintfList,
      apzX11_SprintfMachs,
      X11_SPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aX11_SprintfTests,   apzX11_SprintfPatch }
+     aX11_SprintfTests,   apzX11_SprintfPatch, 0 }
 };