OSDN Git Service

regen: Use c_fix = format instead of sed
[pf3gnuchains/gcc-fork.git] / gcc / fixinc / fixincl.x
index 5b3728b..7d5f0bb 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 146 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
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aaa_Ki_Iface fix
- */
-#define AAA_KI_IFACE_FIXIDX              0
-tSCC zAaa_Ki_IfaceName[] =
-     "AAA_ki_iface";
-
-/*
- *  File name selection pattern
- */
-tSCC zAaa_Ki_IfaceList[] =
-  "|sys/ki_iface.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAaa_Ki_IfaceMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAaa_Ki_IfaceSelect0[] =
-       "These definitions are for HP Internal developers";
-
-#define    AAA_KI_IFACE_TEST_CT  1
-tTestDesc aAaa_Ki_IfaceTests[] = {
-  { TT_EGREP,    zAaa_Ki_IfaceSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aaa_Ki_Iface
- */
-const char* apzAaa_Ki_IfacePatch[] = {
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aaa_Ki fix
- */
-#define AAA_KI_FIXIDX                    1
-tSCC zAaa_KiName[] =
-     "AAA_ki";
-
-/*
- *  File name selection pattern
- */
-tSCC zAaa_KiList[] =
-  "|sys/ki.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAaa_KiMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAaa_KiSelect0[] =
-       "11.00 HP-UX LP64";
-
-#define    AAA_KI_TEST_CT  1
-tTestDesc aAaa_KiTests[] = {
-  { TT_EGREP,    zAaa_KiSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aaa_Ki
- */
-const char* apzAaa_KiPatch[] = {
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aaa_Ki_Calls fix
- */
-#define AAA_KI_CALLS_FIXIDX              2
-tSCC zAaa_Ki_CallsName[] =
-     "AAA_ki_calls";
-
-/*
- *  File name selection pattern
- */
-tSCC zAaa_Ki_CallsList[] =
-  "|sys/ki_calls.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAaa_Ki_CallsMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAaa_Ki_CallsSelect0[] =
-       "kthread_create_caller_t";
-
-#define    AAA_KI_CALLS_TEST_CT  1
-tTestDesc aAaa_Ki_CallsTests[] = {
-  { TT_EGREP,    zAaa_Ki_CallsSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aaa_Ki_Calls
- */
-const char* apzAaa_Ki_CallsPatch[] = {
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aaa_Ki_Defs fix
- */
-#define AAA_KI_DEFS_FIXIDX               3
-tSCC zAaa_Ki_DefsName[] =
-     "AAA_ki_defs";
-
-/*
- *  File name selection pattern
- */
-tSCC zAaa_Ki_DefsList[] =
-  "|sys/ki_defs.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAaa_Ki_DefsMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAaa_Ki_DefsSelect0[] =
-       "Kernel Instrumentation Definitions";
-
-#define    AAA_KI_DEFS_TEST_CT  1
-tTestDesc aAaa_Ki_DefsTests[] = {
-  { TT_EGREP,    zAaa_Ki_DefsSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aaa_Ki_Defs
- */
-const char* apzAaa_Ki_DefsPatch[] = {
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aaa_Bad_Fixes fix
- */
-#define AAA_BAD_FIXES_FIXIDX             4
-tSCC zAaa_Bad_FixesName[] =
-     "AAA_bad_fixes";
-
-/*
- *  File name selection pattern
- */
-tSCC zAaa_Bad_FixesList[] =
-  "|sundev/ipi_error.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAaa_Bad_FixesMachs (const char**)NULL
-#define AAA_BAD_FIXES_TEST_CT  0
-#define aAaa_Bad_FixesTests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Aaa_Bad_Fixes
- */
-const char* apzAaa_Bad_FixesPatch[] = {
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aaa_Time fix
- */
-#define AAA_TIME_FIXIDX                  5
-tSCC zAaa_TimeName[] =
-     "AAA_time";
-
-/*
- *  File name selection pattern
- */
-tSCC zAaa_TimeList[] =
-  "|sys/time.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAaa_TimeMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAaa_TimeSelect0[] =
-       "11.0 and later representation of ki time";
-
-#define    AAA_TIME_TEST_CT  1
-tTestDesc aAaa_TimeTests[] = {
-  { TT_EGREP,    zAaa_TimeSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aaa_Time
- */
-const char* apzAaa_TimePatch[] = {
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Aab_Dgux_Int_Varargs fix
  */
-#define AAB_DGUX_INT_VARARGS_FIXIDX      6
 tSCC zAab_Dgux_Int_VarargsName[] =
      "AAB_dgux_int_varargs";
 
@@ -249,76 +52,59 @@ tSCC zAab_Dgux_Int_VarargsList[] =
 /*
  *  Fix Command Arguments for Aab_Dgux_Int_Varargs
  */
-const char* apzAab_Dgux_Int_VarargsPatch[] = {
+static const char* apzAab_Dgux_Int_VarargsPatch[] = {
 "#ifndef __INT_VARARGS_H\n\
-#define __INT_VARARGS_H\n\
-\n\
-/************************************************************************/\n\
-/* _INT_VARARGS.H - Define the common stuff for varargs/stdarg/stdio.   */\n\
-/************************************************************************/\n\
-\n\
+#define __INT_VARARGS_H\n\n\
+/********************************************************/\n\
+/*  Define the common stuff for varargs/stdarg/stdio.   */\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",
+#endif /*  #ifndef __INT_VARARGS_H  */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aab_Fd_Zero_Asm_Posix_Types_H fix
  */
-#define AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX 7
 tSCC zAab_Fd_Zero_Asm_Posix_Types_HName[] =
      "AAB_fd_zero_asm_posix_types_h";
 
@@ -331,7 +117,7 @@ tSCC zAab_Fd_Zero_Asm_Posix_Types_HList[] =
  *  Machine/OS name selection pattern
  */
 tSCC* apzAab_Fd_Zero_Asm_Posix_Types_HMachs[] = {
-        "i[34567]86-*-linux-gnu*",
+        "i[34567]86-*-linux*",
         (const char*)NULL };
 
 /*
@@ -341,40 +127,37 @@ tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass0[] =
        "} while";
 
 #define    AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT  1
-tTestDesc aAab_Fd_Zero_Asm_Posix_Types_HTests[] = {
+static tTestDesc aAab_Fd_Zero_Asm_Posix_Types_HTests[] = {
   { TT_NEGREP,   zAab_Fd_Zero_Asm_Posix_Types_HBypass0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aab_Fd_Zero_Asm_Posix_Types_H
  */
-const char* apzAab_Fd_Zero_Asm_Posix_Types_HPatch[] = {
+static const char* apzAab_Fd_Zero_Asm_Posix_Types_HPatch[] = {
 "/* This file fixes a bug in the __FD_ZERO macro\n\
    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\
   do { \\\n\
     int __d0, __d1; \\\n\
-\t\t__asm__ __volatile__(\"cld ; rep ; stosl\" \\\n\
-\t\t\t: \"=&c\" (__d0), \"=&D\" (__d1) \\\n\
-\t\t\t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\
-\t\t\t  \"1\" ((__kernel_fd_set *) (fdsetp)) :\"memory\"); \\\n\
+__asm__ __volatile__(\"cld ; rep ; stosl\" \\\n\
+: \"=&c\" (__d0), \"=&D\" (__d1) \\\n\
+: \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\
+  \"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",
+#endif /* _POSIX_TYPES_H_WRAPPER */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aab_Fd_Zero_Gnu_Types_H fix
  */
-#define AAB_FD_ZERO_GNU_TYPES_H_FIXIDX   8
 tSCC zAab_Fd_Zero_Gnu_Types_HName[] =
      "AAB_fd_zero_gnu_types_h";
 
@@ -387,7 +170,7 @@ tSCC zAab_Fd_Zero_Gnu_Types_HList[] =
  *  Machine/OS name selection pattern
  */
 tSCC* apzAab_Fd_Zero_Gnu_Types_HMachs[] = {
-        "i[34567]86-*-linux-gnu*",
+        "i[34567]86-*-linux*",
         (const char*)NULL };
 #define AAB_FD_ZERO_GNU_TYPES_H_TEST_CT  0
 #define aAab_Fd_Zero_Gnu_Types_HTests   (tTestDesc*)NULL
@@ -395,12 +178,11 @@ tSCC* apzAab_Fd_Zero_Gnu_Types_HMachs[] = {
 /*
  *  Fix Command Arguments for Aab_Fd_Zero_Gnu_Types_H
  */
-const char* apzAab_Fd_Zero_Gnu_Types_HPatch[] = {
+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 +193,7 @@ 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 +202,6 @@ const char* apzAab_Fd_Zero_Gnu_Types_HPatch[] = {
  *
  *  Description of Aab_Fd_Zero_Selectbits_H fix
  */
-#define AAB_FD_ZERO_SELECTBITS_H_FIXIDX  9
 tSCC zAab_Fd_Zero_Selectbits_HName[] =
      "AAB_fd_zero_selectbits_h";
 
@@ -434,7 +214,7 @@ tSCC zAab_Fd_Zero_Selectbits_HList[] =
  *  Machine/OS name selection pattern
  */
 tSCC* apzAab_Fd_Zero_Selectbits_HMachs[] = {
-        "i[34567]86-*-linux-gnu*",
+        "i[34567]86-*-linux*",
         (const char*)NULL };
 #define AAB_FD_ZERO_SELECTBITS_H_TEST_CT  0
 #define aAab_Fd_Zero_Selectbits_HTests   (tTestDesc*)NULL
@@ -442,12 +222,11 @@ tSCC* apzAab_Fd_Zero_Selectbits_HMachs[] = {
 /*
  *  Fix Command Arguments for Aab_Fd_Zero_Selectbits_H
  */
-const char* apzAab_Fd_Zero_Selectbits_HPatch[] = {
+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 +241,7 @@ 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 +250,6 @@ const char* apzAab_Fd_Zero_Selectbits_HPatch[] = {
  *
  *  Description of Aab_Sun_Memcpy fix
  */
-#define AAB_SUN_MEMCPY_FIXIDX            10
 tSCC zAab_Sun_MemcpyName[] =
      "AAB_sun_memcpy";
 
@@ -493,17 +270,16 @@ tSCC zAab_Sun_MemcpySelect0[] =
        "/\\*\t@\\(#\\)(head/memory.h\t50.1\t |memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2\t)\\*/";
 
 #define    AAB_SUN_MEMCPY_TEST_CT  1
-tTestDesc aAab_Sun_MemcpyTests[] = {
+static tTestDesc aAab_Sun_MemcpyTests[] = {
   { TT_EGREP,    zAab_Sun_MemcpySelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aab_Sun_Memcpy
  */
-const char* apzAab_Sun_MemcpyPatch[] = {
+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,18 +290,47 @@ 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 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Aab_Solaris_Sys_Varargs_H fix
+ */
+tSCC zAab_Solaris_Sys_Varargs_HName[] =
+     "AAB_solaris_sys_varargs_h";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAab_Solaris_Sys_Varargs_HList[] =
+  "|sys/varargs.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAab_Solaris_Sys_Varargs_HMachs[] = {
+        "*-*-solaris*",
+        (const char*)NULL };
+#define AAB_SOLARIS_SYS_VARARGS_H_TEST_CT  0
+#define aAab_Solaris_Sys_Varargs_HTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Aab_Solaris_Sys_Varargs_H
+ */
+static const char* apzAab_Solaris_Sys_Varargs_HPatch[] = {
+"#ifdef __STDC__\n\
+#include <stdarg.h>\n\
+#else\n\
+#include <varargs.h>\n\
+#endif\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Aab_Svr4_Replace_Byteorder fix
  */
-#define AAB_SVR4_REPLACE_BYTEORDER_FIXIDX 11
 tSCC zAab_Svr4_Replace_ByteorderName[] =
      "AAB_svr4_replace_byteorder";
 
@@ -551,144 +356,108 @@ tSCC* apzAab_Svr4_Replace_ByteorderMachs[] = {
 /*
  *  Fix Command Arguments for Aab_Svr4_Replace_Byteorder
  */
-const char* apzAab_Svr4_Replace_ByteorderPatch[] = {
+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 +470,6 @@ ntohs (unsigned int __arg)\n\
  *
  *  Description of Aab_Ultrix_Ansi_Compat fix
  */
-#define AAB_ULTRIX_ANSI_COMPAT_FIXIDX    12
 tSCC zAab_Ultrix_Ansi_CompatName[] =
      "AAB_ultrix_ansi_compat";
 
@@ -722,13 +490,13 @@ tSCC zAab_Ultrix_Ansi_CompatSelect0[] =
        "ULTRIX";
 
 #define    AAB_ULTRIX_ANSI_COMPAT_TEST_CT  1
-tTestDesc aAab_Ultrix_Ansi_CompatTests[] = {
+static tTestDesc aAab_Ultrix_Ansi_CompatTests[] = {
   { TT_EGREP,    zAab_Ultrix_Ansi_CompatSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aab_Ultrix_Ansi_Compat
  */
-const char* apzAab_Ultrix_Ansi_CompatPatch[] = {
+static const char* apzAab_Ultrix_Ansi_CompatPatch[] = {
 "/* This file intentionally left blank.  */\n",
     (char*)NULL };
 
@@ -736,7 +504,6 @@ const char* apzAab_Ultrix_Ansi_CompatPatch[] = {
  *
  *  Description of Aab_Ultrix_Limits fix
  */
-#define AAB_ULTRIX_LIMITS_FIXIDX         13
 tSCC zAab_Ultrix_LimitsName[] =
      "AAB_ultrix_limits";
 
@@ -757,10 +524,8 @@ tSCC* apzAab_Ultrix_LimitsMachs[] = {
 /*
  *  Fix Command Arguments for Aab_Ultrix_Limits
  */
-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\
+static const char* apzAab_Ultrix_LimitsPatch[] = {
+"#ifndef _LIMITS_INCLUDED\n\
 #define _LIMITS_INCLUDED\n\
 #include <sys/limits.h>\n\
 #endif /* _LIMITS_INCLUDED */\n",
@@ -770,7 +535,6 @@ const char* apzAab_Ultrix_LimitsPatch[] = {
  *
  *  Description of Aab_Ultrix_Memory fix
  */
-#define AAB_ULTRIX_MEMORY_FIXIDX         14
 tSCC zAab_Ultrix_MemoryName[] =
      "AAB_ultrix_memory";
 
@@ -791,10 +555,8 @@ tSCC* apzAab_Ultrix_MemoryMachs[] = {
 /*
  *  Fix Command Arguments for Aab_Ultrix_Memory
  */
-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\
+static const char* apzAab_Ultrix_MemoryPatch[] = {
+"#ifndef _MEMORY_INCLUDED\n\
 #define _MEMORY_INCLUDED\n\
 #include <strings.h>\n\
 #endif /* _MEMORY_INCLUDED */\n",
@@ -804,7 +566,6 @@ const char* apzAab_Ultrix_MemoryPatch[] = {
  *
  *  Description of Aab_Ultrix_String fix
  */
-#define AAB_ULTRIX_STRING_FIXIDX         15
 tSCC zAab_Ultrix_StringName[] =
      "AAB_ultrix_string";
 
@@ -825,10 +586,8 @@ tSCC* apzAab_Ultrix_StringMachs[] = {
 /*
  *  Fix Command Arguments for Aab_Ultrix_String
  */
-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\
+static const char* apzAab_Ultrix_StringPatch[] = {
+"#ifndef _STRING_INCLUDED\n\
 #define _STRING_INCLUDED\n\
 #include <strings.h>\n\
 #endif /* _STRING_INCLUDED */\n",
@@ -836,9 +595,80 @@ const char* apzAab_Ultrix_StringPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Aix_Pthread fix
+ */
+tSCC zAix_PthreadName[] =
+     "aix_pthread";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_PthreadList[] =
+  "|pthread.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAix_PthreadMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_PthreadSelect0[] =
+       "(#define [A-Za-z_0-9]+)(\\\\\n\
+[^A-Za-z_0-9 \t\n\
+(])";
+
+#define    AIX_PTHREAD_TEST_CT  1
+static tTestDesc aAix_PthreadTests[] = {
+  { TT_EGREP,    zAix_PthreadSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Pthread
+ */
+static const char* apzAix_PthreadPatch[] = {
+    "format",
+    "%1 %2",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Sysmachine fix
+ */
+tSCC zAix_SysmachineName[] =
+     "aix_sysmachine";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_SysmachineList[] =
+  "|sys/machine.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAix_SysmachineMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_SysmachineSelect0[] =
+       "\\\\ +\n";
+
+#define    AIX_SYSMACHINE_TEST_CT  1
+static tTestDesc aAix_SysmachineTests[] = {
+  { TT_EGREP,    zAix_SysmachineSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Sysmachine
+ */
+static const char* apzAix_SysmachinePatch[] = {
+    "format",
+    "\\\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Aix_Syswait fix
  */
-#define AIX_SYSWAIT_FIXIDX               16
 tSCC zAix_SyswaitName[] =
      "aix_syswait";
 
@@ -861,14 +691,14 @@ tSCC zAix_SyswaitSelect1[] =
        "bos325,";
 
 #define    AIX_SYSWAIT_TEST_CT  2
-tTestDesc aAix_SyswaitTests[] = {
+static tTestDesc aAix_SyswaitTests[] = {
   { TT_EGREP,    zAix_SyswaitSelect0, (regex_t*)NULL },
   { TT_EGREP,    zAix_SyswaitSelect1, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aix_Syswait
  */
-const char* apzAix_SyswaitPatch[] = {
+static const char* apzAix_SyswaitPatch[] = {
     "format",
     "struct rusage;\n\
 %0",
@@ -878,7 +708,6 @@ const char* apzAix_SyswaitPatch[] = {
  *
  *  Description of Aix_Volatile fix
  */
-#define AIX_VOLATILE_FIXIDX              17
 tSCC zAix_VolatileName[] =
      "aix_volatile";
 
@@ -899,22 +728,91 @@ tSCC zAix_VolatileSelect0[] =
        "typedef volatile int sig_atomic_t";
 
 #define    AIX_VOLATILE_TEST_CT  1
-tTestDesc aAix_VolatileTests[] = {
+static tTestDesc aAix_VolatileTests[] = {
   { TT_EGREP,    zAix_VolatileSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aix_Volatile
  */
-const char* apzAix_VolatilePatch[] = {
+static const char* apzAix_VolatilePatch[] = {
     "format",
     "typedef int sig_atomic_t",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Alpha___Assert fix
+ */
+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_Assert fix
+ */
+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[] =
+       "(#define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
+
+#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",
+    "%1(EX)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Alpha_Getopt fix
  */
-#define ALPHA_GETOPT_FIXIDX              18
 tSCC zAlpha_GetoptName[] =
      "alpha_getopt";
 
@@ -935,13 +833,13 @@ tSCC zAlpha_GetoptSelect0[] =
        "getopt\\(int, char \\*\\[\\], *char \\*\\)";
 
 #define    ALPHA_GETOPT_TEST_CT  1
-tTestDesc aAlpha_GetoptTests[] = {
+static tTestDesc aAlpha_GetoptTests[] = {
   { TT_EGREP,    zAlpha_GetoptSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Alpha_Getopt
  */
-const char* apzAlpha_GetoptPatch[] = {
+static const char* apzAlpha_GetoptPatch[] = {
     "format",
     "getopt(int, char *const[], const char *)",
     (char*)NULL };
@@ -950,7 +848,6 @@ const char* apzAlpha_GetoptPatch[] = {
  *
  *  Description of Alpha_Parens fix
  */
-#define ALPHA_PARENS_FIXIDX              19
 tSCC zAlpha_ParensName[] =
      "alpha_parens";
 
@@ -971,13 +868,13 @@ tSCC zAlpha_ParensSelect0[] =
        "#ifndef\\(__mips64\\)";
 
 #define    ALPHA_PARENS_TEST_CT  1
-tTestDesc aAlpha_ParensTests[] = {
+static tTestDesc aAlpha_ParensTests[] = {
   { TT_EGREP,    zAlpha_ParensSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Alpha_Parens
  */
-const char* apzAlpha_ParensPatch[] = {
+static const char* apzAlpha_ParensPatch[] = {
     "format",
     "#ifndef __mips64",
     (char*)NULL };
@@ -986,7 +883,6 @@ const char* apzAlpha_ParensPatch[] = {
  *
  *  Description of Alpha_Sbrk fix
  */
-#define ALPHA_SBRK_FIXIDX                20
 tSCC zAlpha_SbrkName[] =
      "alpha_sbrk";
 
@@ -1007,13 +903,13 @@ tSCC zAlpha_SbrkSelect0[] =
        "char[ \t]*\\*[\t ]*sbrk[ \t]*\\(";
 
 #define    ALPHA_SBRK_TEST_CT  1
-tTestDesc aAlpha_SbrkTests[] = {
+static tTestDesc aAlpha_SbrkTests[] = {
   { TT_EGREP,    zAlpha_SbrkSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Alpha_Sbrk
  */
-const char* apzAlpha_SbrkPatch[] = {
+static const char* apzAlpha_SbrkPatch[] = {
     "format",
     "void *sbrk(",
     (char*)NULL };
@@ -1022,7 +918,6 @@ const char* apzAlpha_SbrkPatch[] = {
  *
  *  Description of Arm_Norcroft_Hint fix
  */
-#define ARM_NORCROFT_HINT_FIXIDX         21
 tSCC zArm_Norcroft_HintName[] =
      "arm_norcroft_hint";
 
@@ -1043,13 +938,13 @@ tSCC zArm_Norcroft_HintSelect0[] =
        "___type p_type";
 
 #define    ARM_NORCROFT_HINT_TEST_CT  1
-tTestDesc aArm_Norcroft_HintTests[] = {
+static tTestDesc aArm_Norcroft_HintTests[] = {
   { TT_EGREP,    zArm_Norcroft_HintSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Arm_Norcroft_Hint
  */
-const char* apzArm_Norcroft_HintPatch[] = {
+static const char* apzArm_Norcroft_HintPatch[] = {
     "format",
     "p_type",
     (char*)NULL };
@@ -1058,7 +953,6 @@ const char* apzArm_Norcroft_HintPatch[] = {
  *
  *  Description of Arm_Wchar fix
  */
-#define ARM_WCHAR_FIXIDX                 22
 tSCC zArm_WcharName[] =
      "arm_wchar";
 
@@ -1079,13 +973,13 @@ tSCC zArm_WcharSelect0[] =
        "#[ \t]*define[ \t]*__wchar_t";
 
 #define    ARM_WCHAR_TEST_CT  1
-tTestDesc aArm_WcharTests[] = {
+static tTestDesc aArm_WcharTests[] = {
   { TT_EGREP,    zArm_WcharSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Arm_Wchar
  */
-const char* apzArm_WcharPatch[] = {
+static const char* apzArm_WcharPatch[] = {
     "format",
     "%1_GCC_WCHAR_T",
     "(#[ \t]*(ifndef|define)[ \t]+)__wchar_t",
@@ -1095,7 +989,6 @@ const char* apzArm_WcharPatch[] = {
  *
  *  Description of Aux_Asm fix
  */
-#define AUX_ASM_FIXIDX                   23
 tSCC zAux_AsmName[] =
      "aux_asm";
 
@@ -1116,13 +1009,13 @@ tSCC zAux_AsmSelect0[] =
        "#ifndef NOINLINE";
 
 #define    AUX_ASM_TEST_CT  1
-tTestDesc aAux_AsmTests[] = {
+static tTestDesc aAux_AsmTests[] = {
   { TT_EGREP,    zAux_AsmSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aux_Asm
  */
-const char* apzAux_AsmPatch[] = {
+static const char* apzAux_AsmPatch[] = {
     "format",
     "#if !defined(NOINLINE) && !defined(__GNUC__)",
     (char*)NULL };
@@ -1131,7 +1024,6 @@ const char* apzAux_AsmPatch[] = {
  *
  *  Description of Avoid_Bool_Define fix
  */
-#define AVOID_BOOL_DEFINE_FIXIDX         24
 tSCC zAvoid_Bool_DefineName[] =
      "avoid_bool_define";
 
@@ -1158,14 +1050,14 @@ tSCC zAvoid_Bool_DefineBypass0[] =
        "we must use the C\\+\\+ compiler's type";
 
 #define    AVOID_BOOL_DEFINE_TEST_CT  2
-tTestDesc aAvoid_Bool_DefineTests[] = {
+static tTestDesc aAvoid_Bool_DefineTests[] = {
   { TT_NEGREP,   zAvoid_Bool_DefineBypass0, (regex_t*)NULL },
   { TT_EGREP,    zAvoid_Bool_DefineSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Avoid_Bool_Define
  */
-const char* apzAvoid_Bool_DefinePatch[] = {
+static const char* apzAvoid_Bool_DefinePatch[] = {
     "format",
     "#ifndef __cplusplus\n\
 %0\n\
@@ -1177,7 +1069,6 @@ const char* apzAvoid_Bool_DefinePatch[] = {
  *
  *  Description of Avoid_Bool_Type fix
  */
-#define AVOID_BOOL_TYPE_FIXIDX           25
 tSCC zAvoid_Bool_TypeName[] =
      "avoid_bool_type";
 
@@ -1204,61 +1095,94 @@ tSCC zAvoid_Bool_TypeBypass0[] =
        "we must use the C\\+\\+ compiler's type";
 
 #define    AVOID_BOOL_TYPE_TEST_CT  2
-tTestDesc aAvoid_Bool_TypeTests[] = {
+static tTestDesc aAvoid_Bool_TypeTests[] = {
   { TT_NEGREP,   zAvoid_Bool_TypeBypass0, (regex_t*)NULL },
   { TT_EGREP,    zAvoid_Bool_TypeSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Avoid_Bool_Type
  */
-const char* apzAvoid_Bool_TypePatch[] = {
+static const char* apzAvoid_Bool_TypePatch[] = {
     "format",
     "#ifndef __cplusplus\n\
 %0\n\
 #endif",
-    "^[ \t]*typedef[ \t].*[ \t]bool[ \t]*;.*",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Bad_Lval fix
+ *  Description of Avoid_Wchar_T_Type fix
  */
-#define BAD_LVAL_FIXIDX                  26
-tSCC zBad_LvalName[] =
-     "bad_lval";
+tSCC zAvoid_Wchar_T_TypeName[] =
+     "avoid_wchar_t_type";
 
 /*
  *  File name selection pattern
  */
-tSCC zBad_LvalList[] =
-  "|libgen.h|dirent.h|ftw.h|grp.h|ndbm.h|pthread.h|pwd.h|signal.h|standards.h|stdlib.h|string.h|stropts.h|time.h|unistd.h|";
+#define zAvoid_Wchar_T_TypeList (char*)NULL
 /*
  *  Machine/OS name selection pattern
  */
-#define apzBad_LvalMachs (const char**)NULL
+#define apzAvoid_Wchar_T_TypeMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zBad_LvalSelect0[] =
-       "^[ \t]*#[ \t]*pragma[ \t]+extern_prefix";
+tSCC zAvoid_Wchar_T_TypeSelect0[] =
+       "^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;";
 
-#define    BAD_LVAL_TEST_CT  1
-tTestDesc aBad_LvalTests[] = {
-  { TT_EGREP,    zBad_LvalSelect0, (regex_t*)NULL }, };
+#define    AVOID_WCHAR_T_TYPE_TEST_CT  1
+static tTestDesc aAvoid_Wchar_T_TypeTests[] = {
+  { TT_EGREP,    zAvoid_Wchar_T_TypeSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Bad_Lval
+ *  Fix Command Arguments for Avoid_Wchar_T_Type
  */
-const char* apzBad_LvalPatch[] = { "sed",
-    "-e", "s/^[ \t]*#[ \t]*define[ \t][ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*\\(_.*\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/",
+static const char* apzAvoid_Wchar_T_TypePatch[] = {
+    "format",
+    "#ifndef __cplusplus\n\
+%0\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Bad_Struct_Term fix
+ *  Description of Bad_Lval fix
+ */
+tSCC zBad_LvalName[] =
+     "bad_lval";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zBad_LvalList[] =
+  "|libgen.h|dirent.h|ftw.h|grp.h|ndbm.h|pthread.h|pwd.h|signal.h|standards.h|stdlib.h|string.h|stropts.h|time.h|unistd.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzBad_LvalMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zBad_LvalSelect0[] =
+       "^[ \t]*#[ \t]*pragma[ \t]+extern_prefix";
+
+#define    BAD_LVAL_TEST_CT  1
+static tTestDesc aBad_LvalTests[] = {
+  { TT_EGREP,    zBad_LvalSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Bad_Lval
+ */
+static const char* apzBad_LvalPatch[] = { "sed",
+    "-e", "s/^[ \t]*#[ \t]*define[ \t][ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*\\(_.*\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Bad_Struct_Term fix
  */
-#define BAD_STRUCT_TERM_FIXIDX           27
 tSCC zBad_Struct_TermName[] =
      "bad_struct_term";
 
@@ -1279,13 +1203,13 @@ tSCC zBad_Struct_TermSelect0[] =
        "^[ \t]*typedef[ \t]+struct[ \t]+term[ \t]*;";
 
 #define    BAD_STRUCT_TERM_TEST_CT  1
-tTestDesc aBad_Struct_TermTests[] = {
+static tTestDesc aBad_Struct_TermTests[] = {
   { TT_EGREP,    zBad_Struct_TermSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Bad_Struct_Term
  */
-const char* apzBad_Struct_TermPatch[] = {
+static const char* apzBad_Struct_TermPatch[] = {
     "format",
     "struct term;",
     (char*)NULL };
@@ -1294,7 +1218,6 @@ const char* apzBad_Struct_TermPatch[] = {
  *
  *  Description of Badquote fix
  */
-#define BADQUOTE_FIXIDX                  28
 tSCC zBadquoteName[] =
      "badquote";
 
@@ -1315,13 +1238,13 @@ tSCC zBadquoteSelect0[] =
        "doesn't";
 
 #define    BADQUOTE_TEST_CT  1
-tTestDesc aBadquoteTests[] = {
+static tTestDesc aBadquoteTests[] = {
   { TT_EGREP,    zBadquoteSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Badquote
  */
-const char* apzBadquotePatch[] = {
+static const char* apzBadquotePatch[] = {
     "format",
     "does not",
     (char*)NULL };
@@ -1330,7 +1253,6 @@ const char* apzBadquotePatch[] = {
  *
  *  Description of Broken_Assert_Stdio fix
  */
-#define BROKEN_ASSERT_STDIO_FIXIDX       29
 tSCC zBroken_Assert_StdioName[] =
      "broken_assert_stdio";
 
@@ -1357,14 +1279,14 @@ tSCC zBroken_Assert_StdioBypass0[] =
        "include.*stdio\\.h";
 
 #define    BROKEN_ASSERT_STDIO_TEST_CT  2
-tTestDesc aBroken_Assert_StdioTests[] = {
+static tTestDesc aBroken_Assert_StdioTests[] = {
   { TT_NEGREP,   zBroken_Assert_StdioBypass0, (regex_t*)NULL },
   { TT_EGREP,    zBroken_Assert_StdioSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Broken_Assert_Stdio
  */
-const char* apzBroken_Assert_StdioPatch[] = {
+static const char* apzBroken_Assert_StdioPatch[] = {
     "wrap",
     "#include <stdio.h>\n",
     (char*)NULL };
@@ -1373,7 +1295,6 @@ const char* apzBroken_Assert_StdioPatch[] = {
  *
  *  Description of Broken_Assert_Stdlib fix
  */
-#define BROKEN_ASSERT_STDLIB_FIXIDX      30
 tSCC zBroken_Assert_StdlibName[] =
      "broken_assert_stdlib";
 
@@ -1400,14 +1321,14 @@ tSCC zBroken_Assert_StdlibBypass0[] =
        "include.*stdlib\\.h";
 
 #define    BROKEN_ASSERT_STDLIB_TEST_CT  2
-tTestDesc aBroken_Assert_StdlibTests[] = {
+static tTestDesc aBroken_Assert_StdlibTests[] = {
   { TT_NEGREP,   zBroken_Assert_StdlibBypass0, (regex_t*)NULL },
   { TT_EGREP,    zBroken_Assert_StdlibSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Broken_Assert_Stdlib
  */
-const char* apzBroken_Assert_StdlibPatch[] = {
+static const char* apzBroken_Assert_StdlibPatch[] = {
     "wrap",
     "#ifdef __cplusplus\n\
 #include <stdlib.h>\n\
@@ -1418,7 +1339,6 @@ const char* apzBroken_Assert_StdlibPatch[] = {
  *
  *  Description of Broken_Cabs fix
  */
-#define BROKEN_CABS_FIXIDX               31
 tSCC zBroken_CabsName[] =
      "broken_cabs";
 
@@ -1436,26 +1356,25 @@ tSCC zBroken_CabsList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zBroken_CabsSelect0[] =
-       "^extern double cabs";
+       "^extern[ \\t]+double[ \\t]+cabs";
 
 #define    BROKEN_CABS_TEST_CT  1
-tTestDesc aBroken_CabsTests[] = {
+static tTestDesc aBroken_CabsTests[] = {
   { TT_EGREP,    zBroken_CabsSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Broken_Cabs
  */
-const char* apzBroken_CabsPatch[] = {
+static const char* apzBroken_CabsPatch[] = {
     "format",
     "",
-    "^extern double cabs\\((struct dbl_hypot|)\\);",
+    "^extern[ \t]+double[ \t]+cabs\\((struct dbl_hypot|)\\);",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Ctrl_Quotes_Def fix
  */
-#define CTRL_QUOTES_DEF_FIXIDX           32
 tSCC zCtrl_Quotes_DefName[] =
      "ctrl_quotes_def";
 
@@ -1475,13 +1394,13 @@ tSCC zCtrl_Quotes_DefSelect0[] =
        "define[ \t]+[A-Z0-9_]+CTRL\\([a-zA-Z][,)]";
 
 #define    CTRL_QUOTES_DEF_TEST_CT  1
-tTestDesc aCtrl_Quotes_DefTests[] = {
+static tTestDesc aCtrl_Quotes_DefTests[] = {
   { TT_EGREP,    zCtrl_Quotes_DefSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ctrl_Quotes_Def
  */
-const char* apzCtrl_Quotes_DefPatch[] = {
+static const char* apzCtrl_Quotes_DefPatch[] = {
     "char_macro_def",
     "CTRL",
     (char*)NULL };
@@ -1490,7 +1409,6 @@ const char* apzCtrl_Quotes_DefPatch[] = {
  *
  *  Description of Ctrl_Quotes_Use fix
  */
-#define CTRL_QUOTES_USE_FIXIDX           33
 tSCC zCtrl_Quotes_UseName[] =
      "ctrl_quotes_use";
 
@@ -1510,13 +1428,13 @@ tSCC zCtrl_Quotes_UseSelect0[] =
        "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+CTRL[ \t]*\\( *[^,']";
 
 #define    CTRL_QUOTES_USE_TEST_CT  1
-tTestDesc aCtrl_Quotes_UseTests[] = {
+static tTestDesc aCtrl_Quotes_UseTests[] = {
   { TT_EGREP,    zCtrl_Quotes_UseSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ctrl_Quotes_Use
  */
-const char* apzCtrl_Quotes_UsePatch[] = {
+static const char* apzCtrl_Quotes_UsePatch[] = {
     "char_macro_use",
     "CTRL",
     (char*)NULL };
@@ -1525,7 +1443,6 @@ const char* apzCtrl_Quotes_UsePatch[] = {
  *
  *  Description of Cxx_Unready fix
  */
-#define CXX_UNREADY_FIXIDX               34
 tSCC zCxx_UnreadyName[] =
      "cxx_unready";
 
@@ -1552,14 +1469,14 @@ tSCC zCxx_UnreadyBypass0[] =
        "\"C\"|__BEGIN_DECLS";
 
 #define    CXX_UNREADY_TEST_CT  2
-tTestDesc aCxx_UnreadyTests[] = {
+static tTestDesc aCxx_UnreadyTests[] = {
   { TT_NEGREP,   zCxx_UnreadyBypass0, (regex_t*)NULL },
   { TT_EGREP,    zCxx_UnreadySelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Cxx_Unready
  */
-const char* apzCxx_UnreadyPatch[] = {
+static const char* apzCxx_UnreadyPatch[] = {
     "wrap",
     "#ifdef __cplusplus\n\
 extern \"C\" {\n\
@@ -1573,7 +1490,6 @@ extern \"C\" {\n\
  *
  *  Description of Dec_Intern_Asm fix
  */
-#define DEC_INTERN_ASM_FIXIDX            35
 tSCC zDec_Intern_AsmName[] =
      "dec_intern_asm";
 
@@ -1592,7 +1508,7 @@ tSCC zDec_Intern_AsmList[] =
 /*
  *  Fix Command Arguments for Dec_Intern_Asm
  */
-const char* apzDec_Intern_AsmPatch[] = { "sed",
+static const char* apzDec_Intern_AsmPatch[] = { "sed",
     "-e", "/^[ \t]*float[ \t]*fasm/i\\\n\
 #ifdef __DECC\n",
     "-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n\
@@ -1601,9 +1517,51 @@ const char* apzDec_Intern_AsmPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Djgpp_Wchar_H fix
+ */
+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                36
 tSCC zEcd_CursorName[] =
      "ecd_cursor";
 
@@ -1624,13 +1582,13 @@ tSCC zEcd_CursorSelect0[] =
        "ecd\\.cursor";
 
 #define    ECD_CURSOR_TEST_CT  1
-tTestDesc aEcd_CursorTests[] = {
+static tTestDesc aEcd_CursorTests[] = {
   { TT_EGREP,    zEcd_CursorSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ecd_Cursor
  */
-const char* apzEcd_CursorPatch[] = {
+static const char* apzEcd_CursorPatch[] = {
     "format",
     "ecd_cursor",
     (char*)NULL };
@@ -1639,7 +1597,6 @@ const char* apzEcd_CursorPatch[] = {
  *
  *  Description of Fix_Header_Breakage fix
  */
-#define FIX_HEADER_BREAKAGE_FIXIDX       37
 tSCC zFix_Header_BreakageName[] =
      "fix_header_breakage";
 
@@ -1662,22 +1619,106 @@ tSCC zFix_Header_BreakageSelect0[] =
        "extern double floor\\(\\), ceil\\(\\), fmod\\(\\), fabs\\(\\);";
 
 #define    FIX_HEADER_BREAKAGE_TEST_CT  1
-tTestDesc aFix_Header_BreakageTests[] = {
+static tTestDesc aFix_Header_BreakageTests[] = {
   { TT_EGREP,    zFix_Header_BreakageSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Fix_Header_Breakage
  */
-const char* apzFix_Header_BreakagePatch[] = {
+static const char* apzFix_Header_BreakagePatch[] = {
     "format",
     "extern double floor(), ceil(), fmod(), fabs _PARAMS((double));",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Freebsd_Gcc3_Breakage fix
+ */
+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 Gnu_Types fix
+ */
+tSCC zGnu_TypesName[] =
+     "gnu_types";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zGnu_TypesList[] =
+  "|sys/types.h|stdlib.h|sys/stdtypes.h|stddef.h|memory.h|unistd.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzGnu_TypesMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zGnu_TypesSelect0[] =
+       "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zGnu_TypesBypass0[] =
+       "_GCC_(PTRDIFF|SIZE|WCHAR)_T";
+
+#define    GNU_TYPES_TEST_CT  2
+static tTestDesc aGnu_TypesTests[] = {
+  { TT_NEGREP,   zGnu_TypesBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zGnu_TypesSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Gnu_Types
+ */
+static const char* apzGnu_TypesPatch[] = {
+    "gnu_type",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Hp_Inline fix
  */
-#define HP_INLINE_FIXIDX                 38
 tSCC zHp_InlineName[] =
      "hp_inline";
 
@@ -1698,13 +1739,13 @@ tSCC zHp_InlineSelect0[] =
        "[ \t]*#[ \t]*include[ \t]+\"\\.\\./machine/";
 
 #define    HP_INLINE_TEST_CT  1
-tTestDesc aHp_InlineTests[] = {
+static tTestDesc aHp_InlineTests[] = {
   { TT_EGREP,    zHp_InlineSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Hp_Inline
  */
-const char* apzHp_InlinePatch[] = {
+static const char* apzHp_InlinePatch[] = {
     "format",
     "%1<machine/%2.h>",
     "([ \t]*#[ \t]*include[ \t]+)\"\\.\\./machine/([a-z]+)\\.h\"",
@@ -1714,7 +1755,6 @@ const char* apzHp_InlinePatch[] = {
  *
  *  Description of Hp_Sysfile fix
  */
-#define HP_SYSFILE_FIXIDX                39
 tSCC zHp_SysfileName[] =
      "hp_sysfile";
 
@@ -1735,13 +1775,13 @@ tSCC zHp_SysfileSelect0[] =
        "HPUX_SOURCE";
 
 #define    HP_SYSFILE_TEST_CT  1
-tTestDesc aHp_SysfileTests[] = {
+static tTestDesc aHp_SysfileTests[] = {
   { TT_EGREP,    zHp_SysfileSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Hp_Sysfile
  */
-const char* apzHp_SysfilePatch[] = {
+static const char* apzHp_SysfilePatch[] = {
     "format",
     "(struct file *, ...)",
     "\\(\\.\\.\\.\\)",
@@ -1749,9 +1789,87 @@ const char* apzHp_SysfilePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Hpux10_Cpp_Pow_Inline fix
+ */
+tSCC zHpux10_Cpp_Pow_InlineName[] =
+     "hpux10_cpp_pow_inline";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux10_Cpp_Pow_InlineList[] =
+  "|fixinc-test-limits.h|math.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHpux10_Cpp_Pow_InlineMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux10_Cpp_Pow_InlineSelect0[] =
+       "^# +ifdef +__cplusplus\n\
+ +}\n\
+ +inline +double +pow\\(double +__d,int +__expon\\) +{\n\
+[ \t]+return +pow\\(__d,\\(double\\)__expon\\);\n\
+ +}\n\
+ +extern +\"C\" +{\n\
+#else\n\
+# +endif";
+
+#define    HPUX10_CPP_POW_INLINE_TEST_CT  1
+static tTestDesc aHpux10_Cpp_Pow_InlineTests[] = {
+  { TT_EGREP,    zHpux10_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux10_Cpp_Pow_Inline
+ */
+static const char* apzHpux10_Cpp_Pow_InlinePatch[] = {
+    "format",
+    "",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux11_Cpp_Pow_Inline fix
+ */
+tSCC zHpux11_Cpp_Pow_InlineName[] =
+     "hpux11_cpp_pow_inline";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_Cpp_Pow_InlineList[] =
+  "|math.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHpux11_Cpp_Pow_InlineMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_Cpp_Pow_InlineSelect0[] =
+       " +inline double pow\\(double d,int expon\\) {\n\
+ +return pow\\(d, \\(double\\)expon\\);\n\
+ +}\n";
+
+#define    HPUX11_CPP_POW_INLINE_TEST_CT  1
+static tTestDesc aHpux11_Cpp_Pow_InlineTests[] = {
+  { TT_EGREP,    zHpux11_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Cpp_Pow_Inline
+ */
+static const char* apzHpux11_Cpp_Pow_InlinePatch[] = {
+    "format",
+    "",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Hpux11_Fabsf fix
  */
-#define HPUX11_FABSF_FIXIDX              40
 tSCC zHpux11_FabsfName[] =
      "hpux11_fabsf";
 
@@ -1778,14 +1896,14 @@ tSCC zHpux11_FabsfBypass0[] =
        "__cplusplus";
 
 #define    HPUX11_FABSF_TEST_CT  2
-tTestDesc aHpux11_FabsfTests[] = {
+static tTestDesc aHpux11_FabsfTests[] = {
   { TT_NEGREP,   zHpux11_FabsfBypass0, (regex_t*)NULL },
   { TT_EGREP,    zHpux11_FabsfSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Hpux11_Fabsf
  */
-const char* apzHpux11_FabsfPatch[] = {
+static const char* apzHpux11_FabsfPatch[] = {
     "format",
     "#ifndef __cplusplus\n\
 %0\n\
@@ -1794,9 +1912,44 @@ const char* apzHpux11_FabsfPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Hpux11_Size_T fix
+ */
+tSCC zHpux11_Size_TName[] =
+     "hpux11_size_t";
+
+/*
+ *  File name selection pattern
+ */
+#define zHpux11_Size_TList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux11_Size_TMachs[] = {
+        "*-hp-hpux11*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_Size_TSelect0[] =
+       "__size_t";
+
+#define    HPUX11_SIZE_T_TEST_CT  1
+static tTestDesc aHpux11_Size_TTests[] = {
+  { TT_EGREP,    zHpux11_Size_TSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Size_T
+ */
+static const char* apzHpux11_Size_TPatch[] = {
+    "format",
+    "_hpux_size_t",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Hpux11_Uint32_C fix
  */
-#define HPUX11_UINT32_C_FIXIDX           41
 tSCC zHpux11_Uint32_CName[] =
      "hpux11_uint32_c";
 
@@ -1817,22 +1970,56 @@ tSCC zHpux11_Uint32_CSelect0[] =
        "^#define UINT32_C\\(__c\\)[ \t]*__CONCAT__\\(__CONCAT_U__\\(__c\\),l\\)";
 
 #define    HPUX11_UINT32_C_TEST_CT  1
-tTestDesc aHpux11_Uint32_CTests[] = {
+static tTestDesc aHpux11_Uint32_CTests[] = {
   { TT_EGREP,    zHpux11_Uint32_CSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Hpux11_Uint32_C
  */
-const char* apzHpux11_Uint32_CPatch[] = {
+static const char* apzHpux11_Uint32_CPatch[] = {
     "format",
     "#define UINT32_C(__c) __CONCAT__(__c,ul)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Hpux11_Vsnprintf fix
+ */
+tSCC zHpux11_VsnprintfName[] =
+     "hpux11_vsnprintf";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_VsnprintfList[] =
+  "|stdio.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHpux11_VsnprintfMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_VsnprintfSelect0[] =
+       "(extern int vsnprintf\\(char \\*, _[hpux]*_size_t, const char \\*,) __va__list\\);";
+
+#define    HPUX11_VSNPRINTF_TEST_CT  1
+static tTestDesc aHpux11_VsnprintfTests[] = {
+  { TT_EGREP,    zHpux11_VsnprintfSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Vsnprintf
+ */
+static const char* apzHpux11_VsnprintfPatch[] = {
+    "format",
+    "%1 __va_list);",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Hpux8_Bogus_Inlines fix
  */
-#define HPUX8_BOGUS_INLINES_FIXIDX       42
 tSCC zHpux8_Bogus_InlinesName[] =
      "hpux8_bogus_inlines";
 
@@ -1853,13 +2040,13 @@ tSCC zHpux8_Bogus_InlinesSelect0[] =
        "inline";
 
 #define    HPUX8_BOGUS_INLINES_TEST_CT  1
-tTestDesc aHpux8_Bogus_InlinesTests[] = {
+static tTestDesc aHpux8_Bogus_InlinesTests[] = {
   { TT_EGREP,    zHpux8_Bogus_InlinesSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Hpux8_Bogus_Inlines
  */
-const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
+static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
     "-e", "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@",
     "-e", "s@inline double abs(double [a-z][a-z]*) {.*}@@",
     "-e", "s@inline int sqr(int [a-z][a-z]*) {.*}@@",
@@ -1868,81 +2055,130 @@ const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Int_Abort_Free_And_Exit fix
+ *  Description of Hpux_Maxint fix
  */
-#define INT_ABORT_FREE_AND_EXIT_FIXIDX   43
-tSCC zInt_Abort_Free_And_ExitName[] =
-     "int_abort_free_and_exit";
+tSCC zHpux_MaxintName[] =
+     "hpux_maxint";
 
 /*
  *  File name selection pattern
  */
-tSCC zInt_Abort_Free_And_ExitList[] =
-  "|stdlib.h|";
+tSCC zHpux_MaxintList[] =
+  "|sys/param.h|values.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzInt_Abort_Free_And_ExitMachs (const char**)NULL
+#define apzHpux_MaxintMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zInt_Abort_Free_And_ExitSelect0[] =
-       "int[ \t]+(abort|free|exit)[ \t]*\\(";
+tSCC zHpux_MaxintSelect0[] =
+       "^#[ \t]*define[ \t]+MAXINT[ \t]";
 
-#define    INT_ABORT_FREE_AND_EXIT_TEST_CT  1
-tTestDesc aInt_Abort_Free_And_ExitTests[] = {
-  { TT_EGREP,    zInt_Abort_Free_And_ExitSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zHpux_MaxintBypass0[] =
+       "^#[ \t]*ifndef[ \t]+MAXINT";
 
 /*
- *  Fix Command Arguments for Int_Abort_Free_And_Exit
+ *  perform the 'test' shell command - do fix on success
  */
-const char* apzInt_Abort_Free_And_ExitPatch[] = {
+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 }, };
+
+/*
+ *  Fix Command Arguments for Hpux_Maxint
+ */
+static const char* apzHpux_MaxintPatch[] = {
     "format",
-    "void\t%1(",
+    "#ifndef MAXINT\n\
+%0\n\
+#endif",
+    "^#[ \t]*define[ \t]+MAXINT[ \t].*",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Isc_Omits_With_Stdc fix
+ *  Description of Hpux_Systime fix
  */
-#define ISC_OMITS_WITH_STDC_FIXIDX       44
-tSCC zIsc_Omits_With_StdcName[] =
-     "isc_omits_with_stdc";
+tSCC zHpux_SystimeName[] =
+     "hpux_systime";
 
 /*
  *  File name selection pattern
  */
-tSCC zIsc_Omits_With_StdcList[] =
-  "|stdio.h|math.h|ctype.h|sys/limits.h|sys/fcntl.h|sys/dirent.h|";
+tSCC zHpux_SystimeList[] =
+  "|sys/time.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzIsc_Omits_With_StdcMachs (const char**)NULL
+#define apzHpux_SystimeMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIsc_Omits_With_StdcSelect0[] =
-       "!defined\\(__STDC__\\) && !defined\\(_POSIX_SOURCE\\)";
+tSCC zHpux_SystimeSelect0[] =
+       "^extern struct sigevent;";
 
-#define    ISC_OMITS_WITH_STDC_TEST_CT  1
-tTestDesc aIsc_Omits_With_StdcTests[] = {
-  { TT_EGREP,    zIsc_Omits_With_StdcSelect0, (regex_t*)NULL }, };
+#define    HPUX_SYSTIME_TEST_CT  1
+static tTestDesc aHpux_SystimeTests[] = {
+  { TT_EGREP,    zHpux_SystimeSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Isc_Omits_With_Stdc
+ *  Fix Command Arguments for Hpux_Systime
  */
-const char* apzIsc_Omits_With_StdcPatch[] = {
+static const char* apzHpux_SystimePatch[] = {
     "format",
-    "!defined(_POSIX_SOURCE)",
+    "struct sigevent;",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Int_Abort_Free_And_Exit fix
+ */
+tSCC zInt_Abort_Free_And_ExitName[] =
+     "int_abort_free_and_exit";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zInt_Abort_Free_And_ExitList[] =
+  "|stdlib.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzInt_Abort_Free_And_ExitMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zInt_Abort_Free_And_ExitSelect0[] =
+       "int[ \t]+(abort|free|exit)[ \t]*\\(";
+
+#define    INT_ABORT_FREE_AND_EXIT_TEST_CT  1
+static tTestDesc aInt_Abort_Free_And_ExitTests[] = {
+  { TT_EGREP,    zInt_Abort_Free_And_ExitSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Int_Abort_Free_And_Exit
+ */
+static const char* apzInt_Abort_Free_And_ExitPatch[] = {
+    "format",
+    "void\t%1(",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Io_Quotes_Def fix
  */
-#define IO_QUOTES_DEF_FIXIDX             45
 tSCC zIo_Quotes_DefName[] =
      "io_quotes_def";
 
@@ -1962,13 +2198,13 @@ tSCC zIo_Quotes_DefSelect0[] =
        "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\([a-zA-Z][,)]";
 
 #define    IO_QUOTES_DEF_TEST_CT  1
-tTestDesc aIo_Quotes_DefTests[] = {
+static tTestDesc aIo_Quotes_DefTests[] = {
   { TT_EGREP,    zIo_Quotes_DefSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Io_Quotes_Def
  */
-const char* apzIo_Quotes_DefPatch[] = {
+static const char* apzIo_Quotes_DefPatch[] = {
     "char_macro_def",
     "IO",
     (char*)NULL };
@@ -1977,7 +2213,6 @@ const char* apzIo_Quotes_DefPatch[] = {
  *
  *  Description of Io_Quotes_Use fix
  */
-#define IO_QUOTES_USE_FIXIDX             46
 tSCC zIo_Quotes_UseName[] =
      "io_quotes_use";
 
@@ -1997,169 +2232,161 @@ tSCC zIo_Quotes_UseSelect0[] =
        "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+IO[A-Z]*[ \t]*\\( *[^,']";
 
 #define    IO_QUOTES_USE_TEST_CT  1
-tTestDesc aIo_Quotes_UseTests[] = {
+static tTestDesc aIo_Quotes_UseTests[] = {
   { TT_EGREP,    zIo_Quotes_UseSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Io_Quotes_Use
  */
-const char* apzIo_Quotes_UsePatch[] = {
+static const char* apzIo_Quotes_UsePatch[] = {
     "char_macro_use",
     "IO",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Maxint fix
+ *  Description of Ip_Missing_Semi fix
  */
-#define HPUX_MAXINT_FIXIDX               47
-tSCC zHpux_MaxintName[] =
-     "hpux_maxint";
+tSCC zIp_Missing_SemiName[] =
+     "ip_missing_semi";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_MaxintList[] =
-  "|sys/param.h|";
+tSCC zIp_Missing_SemiList[] =
+  "|netinet/ip.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux_MaxintMachs (const char**)NULL
+#define apzIp_Missing_SemiMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_MaxintSelect0[] =
-       "^#[ \t]*define[ \t]*MAXINT[ \t]";
+tSCC zIp_Missing_SemiSelect0[] =
+       "}$";
 
-#define    HPUX_MAXINT_TEST_CT  1
-tTestDesc aHpux_MaxintTests[] = {
-  { TT_EGREP,    zHpux_MaxintSelect0, (regex_t*)NULL }, };
+#define    IP_MISSING_SEMI_TEST_CT  1
+static tTestDesc aIp_Missing_SemiTests[] = {
+  { TT_EGREP,    zIp_Missing_SemiSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_Maxint
+ *  Fix Command Arguments for Ip_Missing_Semi
  */
-const char* apzHpux_MaxintPatch[] = {
-    "format",
-    "#ifndef MAXINT\n\
-%0\n\
-#endif",
-    "^#[ \t]*define[ \t]*MAXINT[ \t].*",
+static const char* apzIp_Missing_SemiPatch[] = { "sed",
+    "-e", "/^struct/,/^};/s/}$/};/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Systime fix
+ *  Description of Irix_Asm_Apostrophe fix
  */
-#define HPUX_SYSTIME_FIXIDX              48
-tSCC zHpux_SystimeName[] =
-     "hpux_systime";
+tSCC zIrix_Asm_ApostropheName[] =
+     "irix_asm_apostrophe";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_SystimeList[] =
-  "|sys/time.h|";
+tSCC zIrix_Asm_ApostropheList[] =
+  "|sys/asm.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux_SystimeMachs (const char**)NULL
+#define apzIrix_Asm_ApostropheMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_SystimeSelect0[] =
-       "^extern struct sigevent;";
+tSCC zIrix_Asm_ApostropheSelect0[] =
+       "^[ \t]*#.*[Ww]e're";
 
-#define    HPUX_SYSTIME_TEST_CT  1
-tTestDesc aHpux_SystimeTests[] = {
-  { TT_EGREP,    zHpux_SystimeSelect0, (regex_t*)NULL }, };
+#define    IRIX_ASM_APOSTROPHE_TEST_CT  1
+static tTestDesc aIrix_Asm_ApostropheTests[] = {
+  { TT_EGREP,    zIrix_Asm_ApostropheSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_Systime
+ *  Fix Command Arguments for Irix_Asm_Apostrophe
  */
-const char* apzHpux_SystimePatch[] = {
+static const char* apzIrix_Asm_ApostrophePatch[] = {
     "format",
-    "struct sigevent;",
+    "%1 are",
+    "^([ \t]*#.*[Ww]e)'re",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Ip_Missing_Semi fix
+ *  Description of Irix_Limits_Const fix
  */
-#define IP_MISSING_SEMI_FIXIDX           49
-tSCC zIp_Missing_SemiName[] =
-     "ip_missing_semi";
+tSCC zIrix_Limits_ConstName[] =
+     "irix_limits_const";
 
 /*
  *  File name selection pattern
  */
-tSCC zIp_Missing_SemiList[] =
-  "|netinet/ip.h|";
+tSCC zIrix_Limits_ConstList[] =
+  "|fixinc-test-limits.h|limits.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzIp_Missing_SemiMachs (const char**)NULL
+#define apzIrix_Limits_ConstMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIp_Missing_SemiSelect0[] =
-       "}$";
+tSCC zIrix_Limits_ConstSelect0[] =
+       "^extern const ";
 
-#define    IP_MISSING_SEMI_TEST_CT  1
-tTestDesc aIp_Missing_SemiTests[] = {
-  { TT_EGREP,    zIp_Missing_SemiSelect0, (regex_t*)NULL }, };
+#define    IRIX_LIMITS_CONST_TEST_CT  1
+static tTestDesc aIrix_Limits_ConstTests[] = {
+  { TT_EGREP,    zIrix_Limits_ConstSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Ip_Missing_Semi
+ *  Fix Command Arguments for Irix_Limits_Const
  */
-const char* apzIp_Missing_SemiPatch[] = { "sed",
-    "-e", "/^struct/,/^};/s/}$/};/",
+static const char* apzIrix_Limits_ConstPatch[] = {
+    "format",
+    "extern __const ",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Asm_Apostrophe fix
+ *  Description of Irix_Stdio_Va_List fix
  */
-#define IRIX_ASM_APOSTROPHE_FIXIDX       50
-tSCC zIrix_Asm_ApostropheName[] =
-     "irix_asm_apostrophe";
+tSCC zIrix_Stdio_Va_ListName[] =
+     "irix_stdio_va_list";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Asm_ApostropheList[] =
-  "|sys/asm.h|";
+tSCC zIrix_Stdio_Va_ListList[] =
+  "|stdio.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzIrix_Asm_ApostropheMachs (const char**)NULL
+#define apzIrix_Stdio_Va_ListMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Asm_ApostropheSelect0[] =
-       "^[ \t]*#.*[Ww]e're";
+tSCC zIrix_Stdio_Va_ListSelect0[] =
+       "(printf\\(.*), /\\* va_list \\*/ char \\*";
 
-#define    IRIX_ASM_APOSTROPHE_TEST_CT  1
-tTestDesc aIrix_Asm_ApostropheTests[] = {
-  { TT_EGREP,    zIrix_Asm_ApostropheSelect0, (regex_t*)NULL }, };
+#define    IRIX_STDIO_VA_LIST_TEST_CT  1
+static tTestDesc aIrix_Stdio_Va_ListTests[] = {
+  { TT_EGREP,    zIrix_Stdio_Va_ListSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Asm_Apostrophe
+ *  Fix Command Arguments for Irix_Stdio_Va_List
  */
-const char* apzIrix_Asm_ApostrophePatch[] = {
+static const char* apzIrix_Stdio_Va_ListPatch[] = {
     "format",
-    "%1 are",
-    "^([ \t]*#.*[Ww]e)'re",
+    "%1, __gnuc_va_list",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Isc_Fmod fix
  */
-#define ISC_FMOD_FIXIDX                  51
 tSCC zIsc_FmodName[] =
      "isc_fmod";
 
@@ -2180,22 +2407,56 @@ tSCC zIsc_FmodSelect0[] =
        "fmod\\(double\\)";
 
 #define    ISC_FMOD_TEST_CT  1
-tTestDesc aIsc_FmodTests[] = {
+static tTestDesc aIsc_FmodTests[] = {
   { TT_EGREP,    zIsc_FmodSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Isc_Fmod
  */
-const char* apzIsc_FmodPatch[] = {
+static const char* apzIsc_FmodPatch[] = {
     "format",
     "fmod(double, double)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Isc_Omits_With_Stdc fix
+ */
+tSCC zIsc_Omits_With_StdcName[] =
+     "isc_omits_with_stdc";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIsc_Omits_With_StdcList[] =
+  "|stdio.h|math.h|ctype.h|sys/limits.h|sys/fcntl.h|sys/dirent.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIsc_Omits_With_StdcMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIsc_Omits_With_StdcSelect0[] =
+       "!defined\\(__STDC__\\) && !defined\\(_POSIX_SOURCE\\)";
+
+#define    ISC_OMITS_WITH_STDC_TEST_CT  1
+static tTestDesc aIsc_Omits_With_StdcTests[] = {
+  { TT_EGREP,    zIsc_Omits_With_StdcSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Isc_Omits_With_Stdc
+ */
+static const char* apzIsc_Omits_With_StdcPatch[] = {
+    "format",
+    "!defined(_POSIX_SOURCE)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Kandr_Concat fix
  */
-#define KANDR_CONCAT_FIXIDX              52
 tSCC zKandr_ConcatName[] =
      "kandr_concat";
 
@@ -2216,13 +2477,13 @@ tSCC zKandr_ConcatSelect0[] =
        "/\\*\\*/";
 
 #define    KANDR_CONCAT_TEST_CT  1
-tTestDesc aKandr_ConcatTests[] = {
+static tTestDesc aKandr_ConcatTests[] = {
   { TT_EGREP,    zKandr_ConcatSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Kandr_Concat
  */
-const char* apzKandr_ConcatPatch[] = {
+static const char* apzKandr_ConcatPatch[] = {
     "format",
     "##",
     (char*)NULL };
@@ -2231,7 +2492,6 @@ const char* apzKandr_ConcatPatch[] = {
  *
  *  Description of Libc1_Ifdefd_Memx fix
  */
-#define LIBC1_IFDEFD_MEMX_FIXIDX         53
 tSCC zLibc1_Ifdefd_MemxName[] =
      "libc1_ifdefd_memx";
 
@@ -2258,14 +2518,14 @@ tSCC zLibc1_Ifdefd_MemxBypass0[] =
        "__cplusplus";
 
 #define    LIBC1_IFDEFD_MEMX_TEST_CT  2
-tTestDesc aLibc1_Ifdefd_MemxTests[] = {
+static tTestDesc aLibc1_Ifdefd_MemxTests[] = {
   { TT_NEGREP,   zLibc1_Ifdefd_MemxBypass0, (regex_t*)NULL },
   { TT_EGREP,    zLibc1_Ifdefd_MemxSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Libc1_Ifdefd_Memx
  */
-const char* apzLibc1_Ifdefd_MemxPatch[] = {
+static const char* apzLibc1_Ifdefd_MemxPatch[] = {
     "format",
     "%1",
     "/\\* `mem...' is a built-in function for gcc 2\\.x\\. \\*/\n\
@@ -2280,7 +2540,6 @@ extern [a-z_]+ mem.*(\n\
  *
  *  Description of Limits_Ifndefs fix
  */
-#define LIMITS_IFNDEFS_FIXIDX            54
 tSCC zLimits_IfndefsName[] =
      "limits_ifndefs";
 
@@ -2301,13 +2560,13 @@ tSCC zLimits_IfndefsBypass0[] =
        "ifndef[ \t]+FLT_MIN";
 
 #define    LIMITS_IFNDEFS_TEST_CT  1
-tTestDesc aLimits_IfndefsTests[] = {
+static tTestDesc aLimits_IfndefsTests[] = {
   { TT_NEGREP,   zLimits_IfndefsBypass0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Limits_Ifndefs
  */
-const char* apzLimits_IfndefsPatch[] = {
+static const char* apzLimits_IfndefsPatch[] = {
     "format",
     "#ifndef %1\n\
 %0\n\
@@ -2319,7 +2578,6 @@ const char* apzLimits_IfndefsPatch[] = {
  *
  *  Description of Lynx_Void_Int fix
  */
-#define LYNX_VOID_INT_FIXIDX             55
 tSCC zLynx_Void_IntName[] =
      "lynx_void_int";
 
@@ -2340,13 +2598,13 @@ tSCC zLynx_Void_IntSelect0[] =
        "#[ \t]*define[ \t]+void[ \t]+int[ \t]*";
 
 #define    LYNX_VOID_INT_TEST_CT  1
-tTestDesc aLynx_Void_IntTests[] = {
+static tTestDesc aLynx_Void_IntTests[] = {
   { TT_EGREP,    zLynx_Void_IntSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Lynx_Void_Int
  */
-const char* apzLynx_Void_IntPatch[] = {
+static const char* apzLynx_Void_IntPatch[] = {
     "format",
     "",
     (char*)NULL };
@@ -2355,7 +2613,6 @@ const char* apzLynx_Void_IntPatch[] = {
  *
  *  Description of Lynxos_Fcntl_Proto fix
  */
-#define LYNXOS_FCNTL_PROTO_FIXIDX        56
 tSCC zLynxos_Fcntl_ProtoName[] =
      "lynxos_fcntl_proto";
 
@@ -2376,13 +2633,13 @@ tSCC zLynxos_Fcntl_ProtoSelect0[] =
        "fcntl[ \t]*\\(int, int, int\\)";
 
 #define    LYNXOS_FCNTL_PROTO_TEST_CT  1
-tTestDesc aLynxos_Fcntl_ProtoTests[] = {
+static tTestDesc aLynxos_Fcntl_ProtoTests[] = {
   { TT_EGREP,    zLynxos_Fcntl_ProtoSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Lynxos_Fcntl_Proto
  */
-const char* apzLynxos_Fcntl_ProtoPatch[] = {
+static const char* apzLynxos_Fcntl_ProtoPatch[] = {
     "format",
     "%1...)",
     "(fcntl[ \t]*\\(int, int, )int\\)",
@@ -2392,7 +2649,6 @@ const char* apzLynxos_Fcntl_ProtoPatch[] = {
  *
  *  Description of M88k_Bad_Hypot_Opt fix
  */
-#define M88K_BAD_HYPOT_OPT_FIXIDX        57
 tSCC zM88k_Bad_Hypot_OptName[] =
      "m88k_bad_hypot_opt";
 
@@ -2415,13 +2671,13 @@ tSCC zM88k_Bad_Hypot_OptSelect0[] =
        "^extern double hypot\\(\\);\n";
 
 #define    M88K_BAD_HYPOT_OPT_TEST_CT  1
-tTestDesc aM88k_Bad_Hypot_OptTests[] = {
+static tTestDesc aM88k_Bad_Hypot_OptTests[] = {
   { TT_EGREP,    zM88k_Bad_Hypot_OptSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for M88k_Bad_Hypot_Opt
  */
-const char* apzM88k_Bad_Hypot_OptPatch[] = {
+static const char* apzM88k_Bad_Hypot_OptPatch[] = {
     "format",
     "%0/* Workaround a stupid Motorola optimization if one\n\
    of x or y is 0.0 and the other is negative!  */\n\
@@ -2441,7 +2697,6 @@ static __inline__ double fake_hypot (x, y)\n\
  *
  *  Description of M88k_Bad_S_If fix
  */
-#define M88K_BAD_S_IF_FIXIDX             58
 tSCC zM88k_Bad_S_IfName[] =
      "m88k_bad_s_if";
 
@@ -2464,13 +2719,13 @@ tSCC zM88k_Bad_S_IfSelect0[] =
        "#define[ \t]+S_IS[A-Z]+\\(m\\)[ \t]+\\(m[ \t]*&";
 
 #define    M88K_BAD_S_IF_TEST_CT  1
-tTestDesc aM88k_Bad_S_IfTests[] = {
+static tTestDesc aM88k_Bad_S_IfTests[] = {
   { TT_EGREP,    zM88k_Bad_S_IfSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for M88k_Bad_S_If
  */
-const char* apzM88k_Bad_S_IfPatch[] = {
+static const char* apzM88k_Bad_S_IfPatch[] = {
     "format",
     "#define %1(m) (((m) & S_IFMT) == %2)",
     "#define[ \t]+(S_IS[A-Z]+)\\(m\\)[ \t]+\\(m[ \t]*&[ \t]*(S_IF[A-Z][A-Z][A-Z]+|0[0-9]+)[ \t]*\\)",
@@ -2480,7 +2735,6 @@ const char* apzM88k_Bad_S_IfPatch[] = {
  *
  *  Description of M88k_Multi_Incl fix
  */
-#define M88K_MULTI_INCL_FIXIDX           59
 tSCC zM88k_Multi_InclName[] =
      "m88k_multi_incl";
 
@@ -2503,13 +2757,13 @@ tSCC zM88k_Multi_InclBypass0[] =
        "#ifndef";
 
 #define    M88K_MULTI_INCL_TEST_CT  1
-tTestDesc aM88k_Multi_InclTests[] = {
+static tTestDesc aM88k_Multi_InclTests[] = {
   { TT_NEGREP,   zM88k_Multi_InclBypass0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for M88k_Multi_Incl
  */
-const char* apzM88k_Multi_InclPatch[] = {
+static const char* apzM88k_Multi_InclPatch[] = {
     "wrap",
     (char*)NULL };
 
@@ -2517,15 +2771,13 @@ const char* apzM88k_Multi_InclPatch[] = {
  *
  *  Description of Machine_Ansi_H_Va_List fix
  */
-#define MACHINE_ANSI_H_VA_LIST_FIXIDX    60
 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
  */
@@ -2544,14 +2796,14 @@ tSCC zMachine_Ansi_H_Va_ListBypass0[] =
        "__builtin_va_list";
 
 #define    MACHINE_ANSI_H_VA_LIST_TEST_CT  2
-tTestDesc aMachine_Ansi_H_Va_ListTests[] = {
+static tTestDesc aMachine_Ansi_H_Va_ListTests[] = {
   { TT_NEGREP,   zMachine_Ansi_H_Va_ListBypass0, (regex_t*)NULL },
   { TT_EGREP,    zMachine_Ansi_H_Va_ListSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Machine_Ansi_H_Va_List
  */
-const char* apzMachine_Ansi_H_Va_ListPatch[] = {
+static const char* apzMachine_Ansi_H_Va_ListPatch[] = {
     "format",
     "%1__builtin_va_list",
     "(define[ \t]+_BSD_VA_LIST_[ \t]+).*",
@@ -2561,7 +2813,6 @@ const char* apzMachine_Ansi_H_Va_ListPatch[] = {
  *
  *  Description of Machine_Name fix
  */
-#define MACHINE_NAME_FIXIDX              61
 tSCC zMachine_NameName[] =
      "machine_name";
 
@@ -2580,13 +2831,13 @@ tSCC zMachine_NameName[] =
 tSCC zMachine_NameFTst0[] = "machine_name";
 
 #define    MACHINE_NAME_TEST_CT  1
-tTestDesc aMachine_NameTests[] = {
+static tTestDesc aMachine_NameTests[] = {
   { TT_FUNCTION, zMachine_NameFTst0,   0 /* unused */ }, };
 
 /*
  *  Fix Command Arguments for Machine_Name
  */
-const char* apzMachine_NamePatch[] = {
+static const char* apzMachine_NamePatch[] = {
     "machine_name",
     (char*)NULL };
 
@@ -2594,7 +2845,6 @@ const char* apzMachine_NamePatch[] = {
  *
  *  Description of Math_Exception fix
  */
-#define MATH_EXCEPTION_FIXIDX            62
 tSCC zMath_ExceptionName[] =
      "math_exception";
 
@@ -2621,14 +2871,14 @@ tSCC zMath_ExceptionBypass0[] =
        "We have a problem when using C\\+\\+";
 
 #define    MATH_EXCEPTION_TEST_CT  2
-tTestDesc aMath_ExceptionTests[] = {
+static tTestDesc aMath_ExceptionTests[] = {
   { TT_NEGREP,   zMath_ExceptionBypass0, (regex_t*)NULL },
   { TT_EGREP,    zMath_ExceptionSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Math_Exception
  */
-const char* apzMath_ExceptionPatch[] = {
+static const char* apzMath_ExceptionPatch[] = {
     "wrap",
     "#ifdef __cplusplus\n\
 #define exception __math_exception\n\
@@ -2642,7 +2892,6 @@ const char* apzMath_ExceptionPatch[] = {
  *
  *  Description of Math_Huge_Val_From_Dbl_Max fix
  */
-#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 63
 tSCC zMath_Huge_Val_From_Dbl_MaxName[] =
      "math_huge_val_from_dbl_max";
 
@@ -2660,27 +2909,26 @@ tSCC zMath_Huge_Val_From_Dbl_MaxList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zMath_Huge_Val_From_Dbl_MaxSelect0[] =
-       "define[ \t]*HUGE_VAL[ \t]*DBL_MAX";
+       "define[ \t]+HUGE_VAL[ \t]+DBL_MAX";
 
 /*
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zMath_Huge_Val_From_Dbl_MaxBypass0[] =
-       "define[ \t]*DBL_MAX";
+       "define[ \t]+DBL_MAX";
 
 #define    MATH_HUGE_VAL_FROM_DBL_MAX_TEST_CT  2
-tTestDesc aMath_Huge_Val_From_Dbl_MaxTests[] = {
+static tTestDesc aMath_Huge_Val_From_Dbl_MaxTests[] = {
   { TT_NEGREP,   zMath_Huge_Val_From_Dbl_MaxBypass0, (regex_t*)NULL },
   { TT_EGREP,    zMath_Huge_Val_From_Dbl_MaxSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Math_Huge_Val_From_Dbl_Max
  */
-const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c",
-    "\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h 2>/dev/null`\n\
-\n\
+static const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c",
+    "\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h | sed 's/.*DBL_MAX[ \t]*//' 2>/dev/null`\n\n\
 \tif ( test -n \"${dbl_max_def}\" ) > /dev/null 2>&1\n\
-\tthen sed -e '/define[ \t]*HUGE_VAL[ \t]*DBL_MAX/s/DBL_MAX/'\"$dbl_max_def/\"\n\
+\tthen sed -e '/define[ \t]*HUGE_VAL[ \t]*DBL_MAX/s@DBL_MAX@'\"$dbl_max_def@\"\n\
 \telse cat\n\
 \tfi",
     (char*)NULL };
@@ -2689,7 +2937,6 @@ const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c",
  *
  *  Description of Math_Huge_Val_Ifndef fix
  */
-#define MATH_HUGE_VAL_IFNDEF_FIXIDX      64
 tSCC zMath_Huge_Val_IfndefName[] =
      "math_huge_val_ifndef";
 
@@ -2710,13 +2957,13 @@ tSCC zMath_Huge_Val_IfndefSelect0[] =
        "define[ \t]+HUGE_VAL";
 
 #define    MATH_HUGE_VAL_IFNDEF_TEST_CT  1
-tTestDesc aMath_Huge_Val_IfndefTests[] = {
+static tTestDesc aMath_Huge_Val_IfndefTests[] = {
   { TT_EGREP,    zMath_Huge_Val_IfndefSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Math_Huge_Val_Ifndef
  */
-const char* apzMath_Huge_Val_IfndefPatch[] = {
+static const char* apzMath_Huge_Val_IfndefPatch[] = {
     "format",
     "#ifndef HUGE_VAL\n\
 %0\n\
@@ -2726,9 +2973,43 @@ const char* apzMath_Huge_Val_IfndefPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Nested_Auth_Des fix
+ */
+tSCC zNested_Auth_DesName[] =
+     "nested_auth_des";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zNested_Auth_DesList[] =
+  "|rpc/rpc.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzNested_Auth_DesMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zNested_Auth_DesSelect0[] =
+       "(/\\*.*rpc/auth_des\\.h>.*)/\\*";
+
+#define    NESTED_AUTH_DES_TEST_CT  1
+static tTestDesc aNested_Auth_DesTests[] = {
+  { TT_EGREP,    zNested_Auth_DesSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Nested_Auth_Des
+ */
+static const char* apzNested_Auth_DesPatch[] = {
+    "format",
+    "%1*/ /*",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Nested_Motorola fix
  */
-#define NESTED_MOTOROLA_FIXIDX           65
 tSCC zNested_MotorolaName[] =
      "nested_motorola";
 
@@ -2743,13 +3024,21 @@ tSCC zNested_MotorolaList[] =
 tSCC* apzNested_MotorolaMachs[] = {
         "m68k-motorola-sysv*",
         (const char*)NULL };
-#define NESTED_MOTOROLA_TEST_CT  0
-#define aNested_MotorolaTests   (tTestDesc*)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zNested_MotorolaSelect0[] =
+       "max # bytes atomic in write|error value returned by Math lib";
+
+#define    NESTED_MOTOROLA_TEST_CT  1
+static tTestDesc aNested_MotorolaTests[] = {
+  { TT_EGREP,    zNested_MotorolaSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Nested_Motorola
  */
-const char* apzNested_MotorolaPatch[] = { "sed",
+static const char* apzNested_MotorolaPatch[] = { "sed",
     "-e", "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*/\\* max # bytes atomic in write to a\\)$@\\1 */@",
     "-e", "s@\\(/\\*#define\tHUGE_VAL\t3.[0-9e+]* \\)\\(/\\*error value returned by Math lib\\*/\\)$@\\1*/ \\2@",
     (char*)NULL };
@@ -2758,7 +3047,6 @@ const char* apzNested_MotorolaPatch[] = { "sed",
  *
  *  Description of Nested_Sys_Limits fix
  */
-#define NESTED_SYS_LIMITS_FIXIDX         66
 tSCC zNested_Sys_LimitsName[] =
      "nested_sys_limits";
 
@@ -2779,58 +3067,21 @@ tSCC zNested_Sys_LimitsSelect0[] =
        "CHILD_MAX";
 
 #define    NESTED_SYS_LIMITS_TEST_CT  1
-tTestDesc aNested_Sys_LimitsTests[] = {
+static tTestDesc aNested_Sys_LimitsTests[] = {
   { TT_EGREP,    zNested_Sys_LimitsSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Nested_Sys_Limits
  */
-const char* apzNested_Sys_LimitsPatch[] = { "sed",
+static const char* apzNested_Sys_LimitsPatch[] = { "sed",
     "-e", "/CHILD_MAX/s,/\\* Max, Max,",
     "-e", "/OPEN_MAX/s,/\\* Max, Max,",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Nested_Auth_Des fix
- */
-#define NESTED_AUTH_DES_FIXIDX           67
-tSCC zNested_Auth_DesName[] =
-     "nested_auth_des";
-
-/*
- *  File name selection pattern
- */
-tSCC zNested_Auth_DesList[] =
-  "|rpc/rpc.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzNested_Auth_DesMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zNested_Auth_DesSelect0[] =
-       "(/\\*.*rpc/auth_des\\.h>.*)/\\*";
-
-#define    NESTED_AUTH_DES_TEST_CT  1
-tTestDesc aNested_Auth_DesTests[] = {
-  { TT_EGREP,    zNested_Auth_DesSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Nested_Auth_Des
- */
-const char* apzNested_Auth_DesPatch[] = {
-    "format",
-    "%1*/ /*",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of News_Os_Recursion fix
  */
-#define NEWS_OS_RECURSION_FIXIDX         68
 tSCC zNews_Os_RecursionName[] =
      "news_os_recursion";
 
@@ -2851,13 +3102,13 @@ tSCC zNews_Os_RecursionSelect0[] =
        "[ \t]*#include <stdlib\\.h>.*";
 
 #define    NEWS_OS_RECURSION_TEST_CT  1
-tTestDesc aNews_Os_RecursionTests[] = {
+static tTestDesc aNews_Os_RecursionTests[] = {
   { TT_EGREP,    zNews_Os_RecursionSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for News_Os_Recursion
  */
-const char* apzNews_Os_RecursionPatch[] = {
+static const char* apzNews_Os_RecursionPatch[] = {
     "format",
     "#ifdef BOGUS_RECURSION\n\
 %0\n\
@@ -2868,7 +3119,6 @@ const char* apzNews_Os_RecursionPatch[] = {
  *
  *  Description of Next_Math_Prefix fix
  */
-#define NEXT_MATH_PREFIX_FIXIDX          69
 tSCC zNext_Math_PrefixName[] =
      "next_math_prefix";
 
@@ -2889,13 +3139,13 @@ tSCC zNext_Math_PrefixSelect0[] =
        "^extern[ \t]+double[ \t]+__const__[ \t]";
 
 #define    NEXT_MATH_PREFIX_TEST_CT  1
-tTestDesc aNext_Math_PrefixTests[] = {
+static tTestDesc aNext_Math_PrefixTests[] = {
   { TT_EGREP,    zNext_Math_PrefixSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Next_Math_Prefix
  */
-const char* apzNext_Math_PrefixPatch[] = {
+static const char* apzNext_Math_PrefixPatch[] = {
     "format",
     "extern double %1(",
     "^extern[ \t]+double[ \t]+__const__[ \t]+([a-z]+)\\(",
@@ -2905,7 +3155,6 @@ const char* apzNext_Math_PrefixPatch[] = {
  *
  *  Description of Next_Template fix
  */
-#define NEXT_TEMPLATE_FIXIDX             70
 tSCC zNext_TemplateName[] =
      "next_template";
 
@@ -2926,13 +3175,13 @@ tSCC zNext_TemplateSelect0[] =
        "[ \t]template\\)";
 
 #define    NEXT_TEMPLATE_TEST_CT  1
-tTestDesc aNext_TemplateTests[] = {
+static tTestDesc aNext_TemplateTests[] = {
   { TT_EGREP,    zNext_TemplateSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Next_Template
  */
-const char* apzNext_TemplatePatch[] = {
+static const char* apzNext_TemplatePatch[] = {
     "format",
     "(%1)",
     "\\(([^)]*)[ \t]template\\)",
@@ -2942,7 +3191,6 @@ const char* apzNext_TemplatePatch[] = {
  *
  *  Description of Next_Volitile fix
  */
-#define NEXT_VOLITILE_FIXIDX             71
 tSCC zNext_VolitileName[] =
      "next_volitile";
 
@@ -2963,13 +3211,13 @@ tSCC zNext_VolitileSelect0[] =
        "^extern[ \t]+volatile[ \t]+void[ \t]";
 
 #define    NEXT_VOLITILE_TEST_CT  1
-tTestDesc aNext_VolitileTests[] = {
+static tTestDesc aNext_VolitileTests[] = {
   { TT_EGREP,    zNext_VolitileSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Next_Volitile
  */
-const char* apzNext_VolitilePatch[] = {
+static const char* apzNext_VolitilePatch[] = {
     "format",
     "extern void %1(",
     "^extern[ \t]+volatile[ \t]+void[ \t]+(exit|abort)\\(",
@@ -2979,7 +3227,6 @@ const char* apzNext_VolitilePatch[] = {
  *
  *  Description of Next_Wait_Union fix
  */
-#define NEXT_WAIT_UNION_FIXIDX           72
 tSCC zNext_Wait_UnionName[] =
      "next_wait_union";
 
@@ -3000,13 +3247,13 @@ tSCC zNext_Wait_UnionSelect0[] =
        "wait\\(union wait";
 
 #define    NEXT_WAIT_UNION_TEST_CT  1
-tTestDesc aNext_Wait_UnionTests[] = {
+static tTestDesc aNext_Wait_UnionTests[] = {
   { TT_EGREP,    zNext_Wait_UnionSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Next_Wait_Union
  */
-const char* apzNext_Wait_UnionPatch[] = {
+static const char* apzNext_Wait_UnionPatch[] = {
     "format",
     "wait(void",
     (char*)NULL };
@@ -3015,7 +3262,6 @@ const char* apzNext_Wait_UnionPatch[] = {
  *
  *  Description of Nodeent_Syntax fix
  */
-#define NODEENT_SYNTAX_FIXIDX            73
 tSCC zNodeent_SyntaxName[] =
      "nodeent_syntax";
 
@@ -3036,13 +3282,13 @@ tSCC zNodeent_SyntaxSelect0[] =
        "char[ \t]*\\*na_addr[ \t]*$";
 
 #define    NODEENT_SYNTAX_TEST_CT  1
-tTestDesc aNodeent_SyntaxTests[] = {
+static tTestDesc aNodeent_SyntaxTests[] = {
   { TT_EGREP,    zNodeent_SyntaxSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Nodeent_Syntax
  */
-const char* apzNodeent_SyntaxPatch[] = {
+static const char* apzNodeent_SyntaxPatch[] = {
     "format",
     "%0;",
     (char*)NULL };
@@ -3051,7 +3297,6 @@ const char* apzNodeent_SyntaxPatch[] = {
  *
  *  Description of Osf_Namespace_A fix
  */
-#define OSF_NAMESPACE_A_FIXIDX           74
 tSCC zOsf_Namespace_AName[] =
      "osf_namespace_a";
 
@@ -3078,7 +3323,7 @@ tSCC zOsf_Namespace_ATest3[] =
        " -z \"`grep __regex_t regex.h`\"";
 
 #define    OSF_NAMESPACE_A_TEST_CT  4
-tTestDesc aOsf_Namespace_ATests[] = {
+static tTestDesc aOsf_Namespace_ATests[] = {
   { TT_TEST,     zOsf_Namespace_ATest0,   0 /* unused */ },
   { TT_TEST,     zOsf_Namespace_ATest1,   0 /* unused */ },
   { TT_TEST,     zOsf_Namespace_ATest2,   0 /* unused */ },
@@ -3087,7 +3332,7 @@ tTestDesc aOsf_Namespace_ATests[] = {
 /*
  *  Fix Command Arguments for Osf_Namespace_A
  */
-const char* apzOsf_Namespace_APatch[] = {
+static const char* apzOsf_Namespace_APatch[] = {
     "format",
     "__%0",
     "reg(ex|off|match)_t",
@@ -3097,7 +3342,6 @@ const char* apzOsf_Namespace_APatch[] = {
  *
  *  Description of Osf_Namespace_C fix
  */
-#define OSF_NAMESPACE_C_FIXIDX           75
 tSCC zOsf_Namespace_CName[] =
      "osf_namespace_c";
 
@@ -3130,7 +3374,7 @@ tSCC zOsf_Namespace_CTest3[] =
        " -z \"`grep __regex_t regex.h`\"";
 
 #define    OSF_NAMESPACE_C_TEST_CT  5
-tTestDesc aOsf_Namespace_CTests[] = {
+static tTestDesc aOsf_Namespace_CTests[] = {
   { TT_TEST,     zOsf_Namespace_CTest0,   0 /* unused */ },
   { TT_TEST,     zOsf_Namespace_CTest1,   0 /* unused */ },
   { TT_TEST,     zOsf_Namespace_CTest2,   0 /* unused */ },
@@ -3140,7 +3384,7 @@ tTestDesc aOsf_Namespace_CTests[] = {
 /*
  *  Fix Command Arguments for Osf_Namespace_C
  */
-const char* apzOsf_Namespace_CPatch[] = {
+static const char* apzOsf_Namespace_CPatch[] = {
     "format",
     "%0\n\
 typedef __regex_t\tregex_t;\n\
@@ -3152,7 +3396,6 @@ typedef __regmatch_t\tregmatch_t;",
  *
  *  Description of Pthread_Page_Size fix
  */
-#define PTHREAD_PAGE_SIZE_FIXIDX         76
 tSCC zPthread_Page_SizeName[] =
      "pthread_page_size";
 
@@ -3173,13 +3416,13 @@ tSCC zPthread_Page_SizeSelect0[] =
        "^int __page_size";
 
 #define    PTHREAD_PAGE_SIZE_TEST_CT  1
-tTestDesc aPthread_Page_SizeTests[] = {
+static tTestDesc aPthread_Page_SizeTests[] = {
   { TT_EGREP,    zPthread_Page_SizeSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Pthread_Page_Size
  */
-const char* apzPthread_Page_SizePatch[] = {
+static const char* apzPthread_Page_SizePatch[] = {
     "format",
     "extern %0",
     (char*)NULL };
@@ -3188,7 +3431,6 @@ const char* apzPthread_Page_SizePatch[] = {
  *
  *  Description of Read_Ret_Type fix
  */
-#define READ_RET_TYPE_FIXIDX             77
 tSCC zRead_Ret_TypeName[] =
      "read_ret_type";
 
@@ -3209,13 +3451,13 @@ tSCC zRead_Ret_TypeSelect0[] =
        "extern int\t.*, fread\\(\\), fwrite\\(\\)";
 
 #define    READ_RET_TYPE_TEST_CT  1
-tTestDesc aRead_Ret_TypeTests[] = {
+static tTestDesc aRead_Ret_TypeTests[] = {
   { TT_EGREP,    zRead_Ret_TypeSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Read_Ret_Type
  */
-const char* apzRead_Ret_TypePatch[] = {
+static const char* apzRead_Ret_TypePatch[] = {
     "format",
     "extern unsigned int fread(), fwrite();\n\
 %1%2",
@@ -3226,7 +3468,6 @@ const char* apzRead_Ret_TypePatch[] = {
  *
  *  Description of Rs6000_Double fix
  */
-#define RS6000_DOUBLE_FIXIDX             78
 tSCC zRs6000_DoubleName[] =
      "rs6000_double";
 
@@ -3247,13 +3488,13 @@ tSCC zRs6000_DoubleSelect0[] =
        "[^a-zA-Z_]class\\(";
 
 #define    RS6000_DOUBLE_TEST_CT  1
-tTestDesc aRs6000_DoubleTests[] = {
+static tTestDesc aRs6000_DoubleTests[] = {
   { TT_EGREP,    zRs6000_DoubleSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Rs6000_Double
  */
-const char* apzRs6000_DoublePatch[] = {
+static const char* apzRs6000_DoublePatch[] = {
     "format",
     "#ifndef __cplusplus\n\
 %0\n\
@@ -3265,7 +3506,6 @@ const char* apzRs6000_DoublePatch[] = {
  *
  *  Description of Rs6000_Fchmod fix
  */
-#define RS6000_FCHMOD_FIXIDX             79
 tSCC zRs6000_FchmodName[] =
      "rs6000_fchmod";
 
@@ -3286,13 +3526,13 @@ tSCC zRs6000_FchmodSelect0[] =
        "fchmod\\(char \\*";
 
 #define    RS6000_FCHMOD_TEST_CT  1
-tTestDesc aRs6000_FchmodTests[] = {
+static tTestDesc aRs6000_FchmodTests[] = {
   { TT_EGREP,    zRs6000_FchmodSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Rs6000_Fchmod
  */
-const char* apzRs6000_FchmodPatch[] = {
+static const char* apzRs6000_FchmodPatch[] = {
     "format",
     "fchmod(int",
     (char*)NULL };
@@ -3301,7 +3541,6 @@ const char* apzRs6000_FchmodPatch[] = {
  *
  *  Description of Rs6000_Param fix
  */
-#define RS6000_PARAM_FIXIDX              80
 tSCC zRs6000_ParamName[] =
      "rs6000_param";
 
@@ -3322,13 +3561,13 @@ tSCC zRs6000_ParamSelect0[] =
        "rename\\(const char \\*old, const char \\*new\\)";
 
 #define    RS6000_PARAM_TEST_CT  1
-tTestDesc aRs6000_ParamTests[] = {
+static tTestDesc aRs6000_ParamTests[] = {
   { TT_EGREP,    zRs6000_ParamSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Rs6000_Param
  */
-const char* apzRs6000_ParamPatch[] = {
+static const char* apzRs6000_ParamPatch[] = {
     "format",
     "rename(const char *_old, const char *_new)",
     (char*)NULL };
@@ -3337,7 +3576,6 @@ const char* apzRs6000_ParamPatch[] = {
  *
  *  Description of Sco_Static_Func fix
  */
-#define SCO_STATIC_FUNC_FIXIDX           81
 tSCC zSco_Static_FuncName[] =
      "sco_static_func";
 
@@ -3360,13 +3598,13 @@ tSCC zSco_Static_FuncSelect0[] =
        "^static int";
 
 #define    SCO_STATIC_FUNC_TEST_CT  1
-tTestDesc aSco_Static_FuncTests[] = {
+static tTestDesc aSco_Static_FuncTests[] = {
   { TT_EGREP,    zSco_Static_FuncSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sco_Static_Func
  */
-const char* apzSco_Static_FuncPatch[] = { "sed",
+static const char* apzSco_Static_FuncPatch[] = { "sed",
     "-e", "/^static int/i\\\n\
 #if __cplusplus\\\n\
 extern \"C\" {\\\n\
@@ -3379,120 +3617,164 @@ extern \"C\" {\\\n\
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sco_Strict_Ansi fix
+ *  Description of Sco_Utime fix
  */
-#define SCO_STRICT_ANSI_FIXIDX           82
-tSCC zSco_Strict_AnsiName[] =
-     "sco_strict_ansi";
+tSCC zSco_UtimeName[] =
+     "sco_utime";
 
 /*
  *  File name selection pattern
  */
-#define zSco_Strict_AnsiList (char*)NULL
+tSCC zSco_UtimeList[] =
+  "|sys/times.h|";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSco_Strict_AnsiMachs[] = {
-        "i?86-*-sco3.2*",
+tSCC* apzSco_UtimeMachs[] = {
+        "i?86-*-sco3.2v4*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSco_Strict_AnsiSelect0[] =
-       "^[ \t]*#[ \t]*if.*!__STDC__";
+tSCC zSco_UtimeSelect0[] =
+       "\\(const char \\*, struct utimbuf \\*\\);";
 
-#define    SCO_STRICT_ANSI_TEST_CT  1
-tTestDesc aSco_Strict_AnsiTests[] = {
-  { TT_EGREP,    zSco_Strict_AnsiSelect0, (regex_t*)NULL }, };
+#define    SCO_UTIME_TEST_CT  1
+static tTestDesc aSco_UtimeTests[] = {
+  { TT_EGREP,    zSco_UtimeSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sco_Strict_Ansi
+ *  Fix Command Arguments for Sco_Utime
  */
-const char* apzSco_Strict_AnsiPatch[] = {
+static const char* apzSco_UtimePatch[] = {
     "format",
-    "%1defined(__STRICT_ANSI__)%2",
-    "^([ \t]*#[ \t]*if[ \t].*!)__STDC__(.*)",
+    "(const char *, const struct utimbuf *);",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sco_Utime fix
+ *  Description of Solaris_Mutex_Init fix
  */
-#define SCO_UTIME_FIXIDX                 83
-tSCC zSco_UtimeName[] =
-     "sco_utime";
+tSCC zSolaris_Mutex_InitName[] =
+     "solaris_mutex_init";
 
 /*
  *  File name selection pattern
  */
-tSCC zSco_UtimeList[] =
-  "|sys/times.h|";
+tSCC zSolaris_Mutex_InitList[] =
+  "|pthread.h|";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSco_UtimeMachs[] = {
-        "i?86-*-sco3.2v4*",
-        (const char*)NULL };
+#define apzSolaris_Mutex_InitMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSco_UtimeSelect0[] =
-       "\\(const char \\*, struct utimbuf \\*\\);";
+tSCC zSolaris_Mutex_InitSelect0[] =
+       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    SCO_UTIME_TEST_CT  1
-tTestDesc aSco_UtimeTests[] = {
-  { TT_EGREP,    zSco_UtimeSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_MUTEX_INIT_TEST_CT  1
+static tTestDesc aSolaris_Mutex_InitTests[] = {
+  { TT_EGREP,    zSolaris_Mutex_InitSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sco_Utime
+ *  Fix Command Arguments for Solaris_Mutex_Init
  */
-const char* apzSco_UtimePatch[] = {
+static const char* apzSolaris_Mutex_InitPatch[] = {
     "format",
-    "(const char *, const struct utimbuf *);",
+    "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
+%0\n\
+#else\n\
+%1, {0}}%3\n\
+#endif",
+    "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+{.*),[ \t]*0}(|[ \t].*)$",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Solaris_Stdio_Tag fix
+ */
+tSCC zSolaris_Stdio_TagName[] =
+     "solaris_stdio_tag";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSolaris_Stdio_TagList[] =
+  "|stdio_tag.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSolaris_Stdio_TagMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Stdio_TagSelect0[] =
+       "__cplusplus < 54321L";
+
+#define    SOLARIS_STDIO_TAG_TEST_CT  1
+static tTestDesc aSolaris_Stdio_TagTests[] = {
+  { TT_EGREP,    zSolaris_Stdio_TagSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Solaris_Stdio_Tag
+ */
+static const char* apzSolaris_Stdio_TagPatch[] = { "sed",
+    "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sony_Include fix
+ *  Description of Solaris_Widec fix
  */
-#define SONY_INCLUDE_FIXIDX              84
-tSCC zSony_IncludeName[] =
-     "sony_include";
+tSCC zSolaris_WidecName[] =
+     "solaris_widec";
 
 /*
  *  File name selection pattern
  */
-tSCC zSony_IncludeList[] =
-  "|machine/machparam.h|";
+tSCC zSolaris_WidecList[] =
+  "|widec.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSony_IncludeMachs (const char**)NULL
+tSCC* apzSolaris_WidecMachs[] = {
+        "*-*-solaris2.[0-5]*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSony_IncludeSelect0[] =
-       "\"\\.\\./machine/endian.h\"";
+tSCC zSolaris_WidecSelect0[] =
+       "#include <euc.h>";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_WidecBypass0[] =
+       "include.*wchar\\.h";
 
-#define    SONY_INCLUDE_TEST_CT  1
-tTestDesc aSony_IncludeTests[] = {
-  { TT_EGREP,    zSony_IncludeSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_WIDEC_TEST_CT  2
+static tTestDesc aSolaris_WidecTests[] = {
+  { TT_NEGREP,   zSolaris_WidecBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_WidecSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sony_Include
+ *  Fix Command Arguments for Solaris_Widec
  */
-const char* apzSony_IncludePatch[] = { "sed",
-    "-e", "s@\"../machine/endian.h\"@<machine/endian.h>@",
+static const char* apzSolaris_WidecPatch[] = {
+    "format",
+    "%0\n\
+#include <wchar.h>",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Statsswtch fix
  */
-#define STATSSWTCH_FIXIDX                85
 tSCC zStatsswtchName[] =
      "statsswtch";
 
@@ -3513,13 +3795,13 @@ tSCC zStatsswtchSelect0[] =
        "boottime$";
 
 #define    STATSSWTCH_TEST_CT  1
-tTestDesc aStatsswtchTests[] = {
+static tTestDesc aStatsswtchTests[] = {
   { TT_EGREP,    zStatsswtchSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Statsswtch
  */
-const char* apzStatsswtchPatch[] = {
+static const char* apzStatsswtchPatch[] = {
     "format",
     "boottime;",
     (char*)NULL };
@@ -3528,7 +3810,6 @@ const char* apzStatsswtchPatch[] = {
  *
  *  Description of Stdio_Stdarg_H fix
  */
-#define STDIO_STDARG_H_FIXIDX            86
 tSCC zStdio_Stdarg_HName[] =
      "stdio_stdarg_h";
 
@@ -3549,13 +3830,13 @@ tSCC zStdio_Stdarg_HBypass0[] =
        "include.*(stdarg.h|machine/ansi.h)";
 
 #define    STDIO_STDARG_H_TEST_CT  1
-tTestDesc aStdio_Stdarg_HTests[] = {
+static tTestDesc aStdio_Stdarg_HTests[] = {
   { TT_NEGREP,   zStdio_Stdarg_HBypass0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Stdio_Stdarg_H
  */
-const char* apzStdio_Stdarg_HPatch[] = {
+static const char* apzStdio_Stdarg_HPatch[] = {
     "wrap",
     "#define __need___va_list\n\
 #include <stdarg.h>\n",
@@ -3565,7 +3846,6 @@ const char* apzStdio_Stdarg_HPatch[] = {
  *
  *  Description of Stdio_Va_List fix
  */
-#define STDIO_VA_LIST_FIXIDX             87
 tSCC zStdio_Va_ListName[] =
      "stdio_va_list";
 
@@ -3580,37 +3860,165 @@ tSCC zStdio_Va_ListList[] =
 #define apzStdio_Va_ListMachs (const char**)NULL
 
 /*
- *  content bypass pattern - skip fix if pattern found
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zStdio_Va_ListBypass0[] =
+       "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list";
+
+#define    STDIO_VA_LIST_TEST_CT  1
+static tTestDesc aStdio_Va_ListTests[] = {
+  { TT_NEGREP,   zStdio_Va_ListBypass0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Stdio_Va_List
+ */
+static const char* apzStdio_Va_ListPatch[] = { "sed",
+    "-e", "s@ va_list @ __gnuc_va_list @\n\
+s@ va_list)@ __gnuc_va_list)@\n\
+s@ _VA_LIST_));@ __gnuc_va_list));@\n\
+s@ __VA_LIST__));@ __gnuc_va_list));@\n\
+s@ va_list@ __not_va_list__@\n\
+s@\\*va_list@*__not_va_list__@\n\
+s@ __va_list)@ __gnuc_va_list)@\n\
+s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\
+s@GNUC_VA_LIST@GNUC_Va_LIST@\n\
+s@_NEED___VA_LIST@_NEED___Va_LIST@\n\
+s@VA_LIST@DUMMY_VA_LIST@\n\
+s@_Va_LIST@_VA_LIST@",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Strict_Ansi_Not fix
+ */
+tSCC zStrict_Ansi_NotName[] =
+     "strict_ansi_not";
+
+/*
+ *  File name selection pattern
+ */
+#define zStrict_Ansi_NotList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzStrict_Ansi_NotMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zStrict_Ansi_NotSelect0[] =
+       "^([ \t]*#[ \t]*if.*)(!__STDC__|__STDC__[ \t]*==[ \t]*0|__STDC__[ \t]*!=[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zStrict_Ansi_NotBypass0[] =
+       "GNU and MIPS C compilers define __STDC__ differently";
+
+/*
+ *  perform the C function call test
+ */
+tSCC zStrict_Ansi_NotFTst0[] = "stdc_0_in_system_headers";
+
+#define    STRICT_ANSI_NOT_TEST_CT  3
+static tTestDesc aStrict_Ansi_NotTests[] = {
+  { TT_FUNCTION, zStrict_Ansi_NotFTst0,   0 /* unused */ },
+  { TT_NEGREP,   zStrict_Ansi_NotBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zStrict_Ansi_NotSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Strict_Ansi_Not
+ */
+static const char* apzStrict_Ansi_NotPatch[] = {
+    "format",
+    "%1 !defined(__STRICT_ANSI__)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Strict_Ansi_Not_Ctd fix
+ */
+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|sys/signal.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(]*!*[ \t]*defined\\([a-zA-Z_0-9]+\\)[ \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__)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Strict_Ansi_Only fix
+ */
+tSCC zStrict_Ansi_OnlyName[] =
+     "strict_ansi_only";
+
+/*
+ *  File name selection pattern
+ */
+#define zStrict_Ansi_OnlyList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzStrict_Ansi_OnlyMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zStrict_Ansi_OnlySelect0[] =
+       "^([ \t]*#[ \t]*if.*)(__STDC__[ \t]*!=[ \t]*0|__STDC__[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*!=[ \t]*0)";
+
+/*
+ *  perform the C function call test
  */
-tSCC zStdio_Va_ListBypass0[] =
-       "__gnuc_va_list|_BSD_VA_LIST_";
+tSCC zStrict_Ansi_OnlyFTst0[] = "stdc_0_in_system_headers";
 
-#define    STDIO_VA_LIST_TEST_CT  1
-tTestDesc aStdio_Va_ListTests[] = {
-  { TT_NEGREP,   zStdio_Va_ListBypass0, (regex_t*)NULL }, };
+#define    STRICT_ANSI_ONLY_TEST_CT  2
+static tTestDesc aStrict_Ansi_OnlyTests[] = {
+  { TT_FUNCTION, zStrict_Ansi_OnlyFTst0,   0 /* unused */ },
+  { TT_EGREP,    zStrict_Ansi_OnlySelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Stdio_Va_List
+ *  Fix Command Arguments for Strict_Ansi_Only
  */
-const char* apzStdio_Va_ListPatch[] = { "sed",
-    "-e", "s@ va_list @ __gnuc_va_list @\n\
-s@ va_list)@ __gnuc_va_list)@\n\
-s@ _VA_LIST_));@ __gnuc_va_list));@\n\
-s@ va_list@ __not_va_list__@\n\
-s@\\*va_list@*__not_va_list__@\n\
-s@ __va_list)@ __gnuc_va_list)@\n\
-s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\
-s@GNUC_VA_LIST@GNUC_Va_LIST@\n\
-s@_NEED___VA_LIST@_NEED___Va_LIST@\n\
-s@VA_LIST@DUMMY_VA_LIST@\n\
-s@_Va_LIST@_VA_LIST@",
+static const char* apzStrict_Ansi_OnlyPatch[] = {
+    "format",
+    "%1 defined(__STRICT_ANSI__)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Struct_File fix
  */
-#define STRUCT_FILE_FIXIDX               88
 tSCC zStruct_FileName[] =
      "struct_file";
 
@@ -3631,13 +4039,13 @@ tSCC zStruct_FileSelect0[] =
        "^.*xdrstdio_create.*struct __file_s";
 
 #define    STRUCT_FILE_TEST_CT  1
-tTestDesc aStruct_FileTests[] = {
+static tTestDesc aStruct_FileTests[] = {
   { TT_EGREP,    zStruct_FileSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Struct_File
  */
-const char* apzStruct_FilePatch[] = {
+static const char* apzStruct_FilePatch[] = {
     "format",
     "struct __file_s;\n\
 %0",
@@ -3647,7 +4055,6 @@ const char* apzStruct_FilePatch[] = {
  *
  *  Description of Struct_Sockaddr fix
  */
-#define STRUCT_SOCKADDR_FIXIDX           89
 tSCC zStruct_SockaddrName[] =
      "struct_sockaddr";
 
@@ -3674,14 +4081,14 @@ tSCC zStruct_SockaddrBypass0[] =
        "<sys/socket.h>";
 
 #define    STRUCT_SOCKADDR_TEST_CT  2
-tTestDesc aStruct_SockaddrTests[] = {
+static tTestDesc aStruct_SockaddrTests[] = {
   { TT_NEGREP,   zStruct_SockaddrBypass0, (regex_t*)NULL },
   { TT_EGREP,    zStruct_SockaddrSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Struct_Sockaddr
  */
-const char* apzStruct_SockaddrPatch[] = {
+static const char* apzStruct_SockaddrPatch[] = {
     "format",
     "struct sockaddr;\n\
 %0",
@@ -3691,7 +4098,6 @@ const char* apzStruct_SockaddrPatch[] = {
  *
  *  Description of Sun_Auth_Proto fix
  */
-#define SUN_AUTH_PROTO_FIXIDX            90
 tSCC zSun_Auth_ProtoName[] =
      "sun_auth_proto";
 
@@ -3712,13 +4118,13 @@ tSCC zSun_Auth_ProtoSelect0[] =
        "\\(\\*[a-z][a-z_]*\\)\\(\\)";
 
 #define    SUN_AUTH_PROTO_TEST_CT  1
-tTestDesc aSun_Auth_ProtoTests[] = {
+static tTestDesc aSun_Auth_ProtoTests[] = {
   { TT_EGREP,    zSun_Auth_ProtoSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sun_Auth_Proto
  */
-const char* apzSun_Auth_ProtoPatch[] = {
+static const char* apzSun_Auth_ProtoPatch[] = {
     "format",
     "#ifdef __cplusplus\n\
 %1(...);%2\n\
@@ -3732,7 +4138,6 @@ const char* apzSun_Auth_ProtoPatch[] = {
  *
  *  Description of Sun_Bogus_Ifdef fix
  */
-#define SUN_BOGUS_IFDEF_FIXIDX           91
 tSCC zSun_Bogus_IfdefName[] =
      "sun_bogus_ifdef";
 
@@ -3753,13 +4158,13 @@ tSCC zSun_Bogus_IfdefSelect0[] =
        "#ifdef(.*\\|\\|.*)";
 
 #define    SUN_BOGUS_IFDEF_TEST_CT  1
-tTestDesc aSun_Bogus_IfdefTests[] = {
+static tTestDesc aSun_Bogus_IfdefTests[] = {
   { TT_EGREP,    zSun_Bogus_IfdefSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sun_Bogus_Ifdef
  */
-const char* apzSun_Bogus_IfdefPatch[] = {
+static const char* apzSun_Bogus_IfdefPatch[] = {
     "format",
     "#if%1",
     (char*)NULL };
@@ -3768,7 +4173,6 @@ const char* apzSun_Bogus_IfdefPatch[] = {
  *
  *  Description of Sun_Catmacro fix
  */
-#define SUN_CATMACRO_FIXIDX              92
 tSCC zSun_CatmacroName[] =
      "sun_catmacro";
 
@@ -3789,13 +4193,13 @@ tSCC zSun_CatmacroSelect0[] =
        "^#define[ \t]+CAT\\(a,b\\).*";
 
 #define    SUN_CATMACRO_TEST_CT  1
-tTestDesc aSun_CatmacroTests[] = {
+static tTestDesc aSun_CatmacroTests[] = {
   { TT_EGREP,    zSun_CatmacroSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sun_Catmacro
  */
-const char* apzSun_CatmacroPatch[] = {
+static const char* apzSun_CatmacroPatch[] = {
     "format",
     "#ifdef __STDC__\n\
 #  define CAT(a,b) a##b\n\
@@ -3808,7 +4212,6 @@ const char* apzSun_CatmacroPatch[] = {
  *
  *  Description of Sun_Malloc fix
  */
-#define SUN_MALLOC_FIXIDX                93
 tSCC zSun_MallocName[] =
      "sun_malloc";
 
@@ -3827,7 +4230,7 @@ tSCC zSun_MallocList[] =
 /*
  *  Fix Command Arguments for Sun_Malloc
  */
-const char* apzSun_MallocPatch[] = { "sed",
+static const char* apzSun_MallocPatch[] = { "sed",
     "-e", "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g",
     "-e", "s/int[ \t][ \t]*free/void\tfree/g",
     "-e", "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g",
@@ -3839,7 +4242,6 @@ const char* apzSun_MallocPatch[] = { "sed",
  *
  *  Description of Sun_Rusers_Semi fix
  */
-#define SUN_RUSERS_SEMI_FIXIDX           94
 tSCC zSun_Rusers_SemiName[] =
      "sun_rusers_semi";
 
@@ -3860,13 +4262,13 @@ tSCC zSun_Rusers_SemiSelect0[] =
        "_cnt$";
 
 #define    SUN_RUSERS_SEMI_TEST_CT  1
-tTestDesc aSun_Rusers_SemiTests[] = {
+static tTestDesc aSun_Rusers_SemiTests[] = {
   { TT_EGREP,    zSun_Rusers_SemiSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sun_Rusers_Semi
  */
-const char* apzSun_Rusers_SemiPatch[] = { "sed",
+static const char* apzSun_Rusers_SemiPatch[] = { "sed",
     "-e", "/^struct/,/^};/s/_cnt$/_cnt;/",
     (char*)NULL };
 
@@ -3874,7 +4276,6 @@ const char* apzSun_Rusers_SemiPatch[] = { "sed",
  *
  *  Description of Sun_Signal fix
  */
-#define SUN_SIGNAL_FIXIDX                95
 tSCC zSun_SignalName[] =
      "sun_signal";
 
@@ -3895,13 +4296,13 @@ tSCC zSun_SignalSelect0[] =
        "^void\t\\(\\*signal\\(\\)\\)\\(\\);.*";
 
 #define    SUN_SIGNAL_TEST_CT  1
-tTestDesc aSun_SignalTests[] = {
+static tTestDesc aSun_SignalTests[] = {
   { TT_EGREP,    zSun_SignalSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sun_Signal
  */
-const char* apzSun_SignalPatch[] = {
+static const char* apzSun_SignalPatch[] = {
     "format",
     "#ifdef __cplusplus\n\
 void\t(*signal(...))(...);\n\
@@ -3914,7 +4315,6 @@ void\t(*signal(...))(...);\n\
  *
  *  Description of Sunos_Matherr_Decl fix
  */
-#define SUNOS_MATHERR_DECL_FIXIDX        96
 tSCC zSunos_Matherr_DeclName[] =
      "sunos_matherr_decl";
 
@@ -3938,17 +4338,17 @@ 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
-tTestDesc aSunos_Matherr_DeclTests[] = {
+static tTestDesc aSunos_Matherr_DeclTests[] = {
   { TT_NEGREP,   zSunos_Matherr_DeclBypass0, (regex_t*)NULL },
   { TT_EGREP,    zSunos_Matherr_DeclSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sunos_Matherr_Decl
  */
-const char* apzSunos_Matherr_DeclPatch[] = {
+static const char* apzSunos_Matherr_DeclPatch[] = {
     "wrap",
     "struct exception;\n",
     (char*)NULL };
@@ -3957,7 +4357,6 @@ const char* apzSunos_Matherr_DeclPatch[] = {
  *
  *  Description of Sunos_Strlen fix
  */
-#define SUNOS_STRLEN_FIXIDX              97
 tSCC zSunos_StrlenName[] =
      "sunos_strlen";
 
@@ -3978,13 +4377,13 @@ tSCC zSunos_StrlenSelect0[] =
        "int[ \t]*strlen\\(\\);(.*)";
 
 #define    SUNOS_STRLEN_TEST_CT  1
-tTestDesc aSunos_StrlenTests[] = {
+static tTestDesc aSunos_StrlenTests[] = {
   { TT_EGREP,    zSunos_StrlenSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sunos_Strlen
  */
-const char* apzSunos_StrlenPatch[] = {
+static const char* apzSunos_StrlenPatch[] = {
     "format",
     "__SIZE_TYPE__ strlen();%1",
     (char*)NULL };
@@ -3993,7 +4392,6 @@ const char* apzSunos_StrlenPatch[] = {
  *
  *  Description of Svr4__P fix
  */
-#define SVR4__P_FIXIDX                   98
 tSCC zSvr4__PName[] =
      "svr4__p";
 
@@ -4014,13 +4412,13 @@ tSCC zSvr4__PSelect0[] =
        "^#define[ \t]+__P.*";
 
 #define    SVR4__P_TEST_CT  1
-tTestDesc aSvr4__PTests[] = {
+static tTestDesc aSvr4__PTests[] = {
   { TT_EGREP,    zSvr4__PSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Svr4__P
  */
-const char* apzSvr4__PPatch[] = {
+static const char* apzSvr4__PPatch[] = {
     "format",
     "#ifndef __P\n\
 %0\n\
@@ -4031,7 +4429,6 @@ const char* apzSvr4__PPatch[] = {
  *
  *  Description of Svr4_Getcwd fix
  */
-#define SVR4_GETCWD_FIXIDX               99
 tSCC zSvr4_GetcwdName[] =
      "svr4_getcwd";
 
@@ -4052,13 +4449,13 @@ tSCC zSvr4_GetcwdSelect0[] =
        "getcwd\\(char \\*, int\\)";
 
 #define    SVR4_GETCWD_TEST_CT  1
-tTestDesc aSvr4_GetcwdTests[] = {
+static tTestDesc aSvr4_GetcwdTests[] = {
   { TT_EGREP,    zSvr4_GetcwdSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Svr4_Getcwd
  */
-const char* apzSvr4_GetcwdPatch[] = {
+static const char* apzSvr4_GetcwdPatch[] = {
     "format",
     "getcwd(char *, size_t)",
     (char*)NULL };
@@ -4067,7 +4464,6 @@ const char* apzSvr4_GetcwdPatch[] = {
  *
  *  Description of Svr4_Profil fix
  */
-#define SVR4_PROFIL_FIXIDX               100
 tSCC zSvr4_ProfilName[] =
      "svr4_profil";
 
@@ -4088,127 +4484,21 @@ tSCC zSvr4_ProfilSelect0[] =
        "profil\\(unsigned short \\*, unsigned int, unsigned int, unsigned int\\)";
 
 #define    SVR4_PROFIL_TEST_CT  1
-tTestDesc aSvr4_ProfilTests[] = {
+static tTestDesc aSvr4_ProfilTests[] = {
   { TT_EGREP,    zSvr4_ProfilSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Svr4_Profil
  */
-const char* apzSvr4_ProfilPatch[] = {
+static const char* apzSvr4_ProfilPatch[] = {
     "format",
     "profil(unsigned short *, size_t, int, unsigned int)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Systypes fix
- */
-#define SYSTYPES_FIXIDX                  101
-tSCC zSystypesName[] =
-     "systypes";
-
-/*
- *  File name selection pattern
- */
-tSCC zSystypesList[] =
-  "|sys/types.h|stdlib.h|sys/stdtypes.h|stddef.h|memory.h|unistd.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzSystypesMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSystypesSelect0[] =
-       "typedef[ \t]+[a-z_][ \ta-z_]*[ \t](size|ptrdiff|wchar)_t";
-
-#define    SYSTYPES_TEST_CT  1
-tTestDesc aSystypesTests[] = {
-  { TT_EGREP,    zSystypesSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Systypes
- */
-const char* apzSystypesPatch[] = { "sed",
-    "-e", "/^[ \t]*\\*[ \t]*typedef unsigned int size_t;/N",
-    "-e", "s/^\\([ \t]*\\*[ \t]*typedef unsigned int size_t;\\n[ \t]*\\*\\/\\)/\\1\\\n\
-#ifndef __SIZE_TYPE__\\\n\
-#define __SIZE_TYPE__ long unsigned int\\\n\
-#endif\\\n\
-typedef __SIZE_TYPE__ size_t;\\\n\
-/",
-    "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/i\\\n\
-#ifndef __SIZE_TYPE__\\\n\
-#define __SIZE_TYPE__ long unsigned int\\\n\
-#endif\n",
-    "-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/typedef __SIZE_TYPE__ size_t/",
-    "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/i\\\n\
-#ifndef __PTRDIFF_TYPE__\\\n\
-#define __PTRDIFF_TYPE__ long int\\\n\
-#endif\n",
-    "-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/typedef __PTRDIFF_TYPE__ ptrdiff_t/",
-    "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/i\\\n\
-#ifndef __WCHAR_TYPE__\\\n\
-#define __WCHAR_TYPE__ int\\\n\
-#endif\\\n\
-#ifndef __cplusplus\n",
-    "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/a\\\n\
-#endif\n",
-    "-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/typedef __WCHAR_TYPE__ wchar_t/",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Systypes_Stdlib_Size_T fix
- */
-#define SYSTYPES_STDLIB_SIZE_T_FIXIDX    102
-tSCC zSystypes_Stdlib_Size_TName[] =
-     "systypes_stdlib_size_t";
-
-/*
- *  File name selection pattern
- */
-tSCC zSystypes_Stdlib_Size_TList[] =
-  "|sys/types.h|stdlib.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzSystypes_Stdlib_Size_TMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSystypes_Stdlib_Size_TSelect0[] =
-       "typedef[ \t]+[A-Za-z_][ \tA-Za-z_]*[ \t]size_t.*";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSystypes_Stdlib_Size_TBypass0[] =
-       "_(GCC|BSD)_SIZE_T";
-
-#define    SYSTYPES_STDLIB_SIZE_T_TEST_CT  2
-tTestDesc aSystypes_Stdlib_Size_TTests[] = {
-  { TT_NEGREP,   zSystypes_Stdlib_Size_TBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSystypes_Stdlib_Size_TSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Systypes_Stdlib_Size_T
- */
-const char* apzSystypes_Stdlib_Size_TPatch[] = {
-    "format",
-    "#ifndef _GCC_SIZE_T\n\
-#define _GCC_SIZE_T\n\
-%0\n\
-#endif",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Sysv68_String fix
  */
-#define SYSV68_STRING_FIXIDX             103
 tSCC zSysv68_StringName[] =
      "sysv68_string";
 
@@ -4216,7 +4506,7 @@ tSCC zSysv68_StringName[] =
  *  File name selection pattern
  */
 tSCC zSysv68_StringList[] =
-  "|string.h|";
+  "|testing.h|string.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -4227,25 +4517,24 @@ tSCC zSysv68_StringList[] =
 /*
  *  Fix Command Arguments for Sysv68_String
  */
-const char* apzSysv68_StringPatch[] = { "sed",
+static const char* apzSysv68_StringPatch[] = { "sed",
     "-e", "s/extern[ \t]*int[ \t]*strlen();/extern unsigned int strlen();/",
     "-e", "s/extern[ \t]*int[ \t]*ffs[ \t]*(long);/extern int ffs(int);/",
     "-e", "s/strdup(char \\*s1);/strdup(const char *s1);/",
     "-e", "/^extern char$/N",
     "-e", "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/",
+    "-e", "/^extern int$/N",
+    "-e", "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/",
     "-e", "/^\tstrncmp(),$/N",
     "-e", "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n\
 extern unsigned int\\\n\
 \\2/",
-    "-e", "/^extern int$/N",
-    "-e", "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Sysz_Stdlib_For_Sun fix
  */
-#define SYSZ_STDLIB_FOR_SUN_FIXIDX       104
 tSCC zSysz_Stdlib_For_SunName[] =
      "sysz_stdlib_for_sun";
 
@@ -4266,63 +4555,56 @@ tSCC zSysz_Stdlib_For_SunSelect0[] =
        "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\(";
 
 #define    SYSZ_STDLIB_FOR_SUN_TEST_CT  1
-tTestDesc aSysz_Stdlib_For_SunTests[] = {
+static tTestDesc aSysz_Stdlib_For_SunTests[] = {
   { TT_EGREP,    zSysz_Stdlib_For_SunSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Sysz_Stdlib_For_Sun
  */
-const char* apzSysz_Stdlib_For_SunPatch[] = {
+static const char* apzSysz_Stdlib_For_SunPatch[] = {
     "format",
     "void *\t%1(",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sysz_Stdtypes_For_Sun fix
+ *  Description of Thread_Keyword fix
  */
-#define SYSZ_STDTYPES_FOR_SUN_FIXIDX     105
-tSCC zSysz_Stdtypes_For_SunName[] =
-     "sysz_stdtypes_for_sun";
+tSCC zThread_KeywordName[] =
+     "thread_keyword";
 
 /*
  *  File name selection pattern
  */
-tSCC zSysz_Stdtypes_For_SunList[] =
-  "|sys/stdtypes.h|";
+tSCC zThread_KeywordList[] =
+  "|pthread.h|bits/sigthread.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSysz_Stdtypes_For_SunMachs (const char**)NULL
-#define SYSZ_STDTYPES_FOR_SUN_TEST_CT  0
-#define aSysz_Stdtypes_For_SunTests   (tTestDesc*)NULL
+#define apzThread_KeywordMachs (const char**)NULL
 
 /*
- *  Fix Command Arguments for Sysz_Stdtypes_For_Sun
+ *  content selection pattern - do fix if pattern found
  */
-const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed",
-    "-e", "/[\t ]size_t.*;/i\\\n\
-#ifndef _GCC_SIZE_T\\\n\
-#define _GCC_SIZE_T\n",
-    "-e", "/[\t ]size_t.*;/a\\\n\
-#endif\n",
-    "-e", "/[\t ]ptrdiff_t.*;/i\\\n\
-#ifndef _GCC_PTRDIFF_T\\\n\
-#define _GCC_PTRDIFF_T\n",
-    "-e", "/[\t ]ptrdiff_t.*;/a\\\n\
-#endif\n",
-    "-e", "/[\t ]wchar_t.*;/i\\\n\
-#ifndef _GCC_WCHAR_T\\\n\
-#define _GCC_WCHAR_T\n",
-    "-e", "/[\t ]wchar_t.*;/a\\\n\
-#endif\n",
+tSCC zThread_KeywordSelect0[] =
+       "pthread_t __thread([^a-z0-9_])";
+
+#define    THREAD_KEYWORD_TEST_CT  1
+static tTestDesc aThread_KeywordTests[] = {
+  { TT_EGREP,    zThread_KeywordSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Thread_Keyword
+ */
+static const char* apzThread_KeywordPatch[] = {
+    "format",
+    "pthread_t __thr%1",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Tinfo_Cplusplus fix
  */
-#define TINFO_CPLUSPLUS_FIXIDX           106
 tSCC zTinfo_CplusplusName[] =
      "tinfo_cplusplus";
 
@@ -4343,22 +4625,56 @@ tSCC zTinfo_CplusplusSelect0[] =
        "[ \t]_cplusplus";
 
 #define    TINFO_CPLUSPLUS_TEST_CT  1
-tTestDesc aTinfo_CplusplusTests[] = {
+static tTestDesc aTinfo_CplusplusTests[] = {
   { TT_EGREP,    zTinfo_CplusplusSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Tinfo_Cplusplus
  */
-const char* apzTinfo_CplusplusPatch[] = {
+static const char* apzTinfo_CplusplusPatch[] = {
     "format",
     " __cplusplus",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Ultrix_Atexit_Param fix
+ */
+tSCC zUltrix_Atexit_ParamName[] =
+     "ultrix_atexit_param";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zUltrix_Atexit_ParamList[] =
+  "|stdlib.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzUltrix_Atexit_ParamMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zUltrix_Atexit_ParamSelect0[] =
+       "atexit\\(.*\\(\\)";
+
+#define    ULTRIX_ATEXIT_PARAM_TEST_CT  1
+static tTestDesc aUltrix_Atexit_ParamTests[] = {
+  { TT_EGREP,    zUltrix_Atexit_ParamSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Ultrix_Atexit_Param
+ */
+static const char* apzUltrix_Atexit_ParamPatch[] = {
+    "format",
+    "atexit( void (*__func)( void )",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Ultrix_Atof_Param fix
  */
-#define ULTRIX_ATOF_PARAM_FIXIDX         107
 tSCC zUltrix_Atof_ParamName[] =
      "ultrix_atof_param";
 
@@ -4379,13 +4695,13 @@ tSCC zUltrix_Atof_ParamSelect0[] =
        "atof\\([ \t]*char";
 
 #define    ULTRIX_ATOF_PARAM_TEST_CT  1
-tTestDesc aUltrix_Atof_ParamTests[] = {
+static tTestDesc aUltrix_Atof_ParamTests[] = {
   { TT_EGREP,    zUltrix_Atof_ParamSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Atof_Param
  */
-const char* apzUltrix_Atof_ParamPatch[] = {
+static const char* apzUltrix_Atof_ParamPatch[] = {
     "format",
     "atof(const char",
     (char*)NULL };
@@ -4394,7 +4710,6 @@ const char* apzUltrix_Atof_ParamPatch[] = {
  *
  *  Description of Ultrix_Const fix
  */
-#define ULTRIX_CONST_FIXIDX              108
 tSCC zUltrix_ConstName[] =
      "ultrix_const";
 
@@ -4415,13 +4730,13 @@ tSCC zUltrix_ConstSelect0[] =
        "perror\\( char \\*";
 
 #define    ULTRIX_CONST_TEST_CT  1
-tTestDesc aUltrix_ConstTests[] = {
+static tTestDesc aUltrix_ConstTests[] = {
   { TT_EGREP,    zUltrix_ConstSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Const
  */
-const char* apzUltrix_ConstPatch[] = {
+static const char* apzUltrix_ConstPatch[] = {
     "format",
     "%1 const %3 *__",
     "([ \t*](perror|fputs|fwrite|scanf|fscanf)\\(.*)[ \t]+(char|void) \\*__",
@@ -4431,7 +4746,6 @@ const char* apzUltrix_ConstPatch[] = {
  *
  *  Description of Ultrix_Const2 fix
  */
-#define ULTRIX_CONST2_FIXIDX             109
 tSCC zUltrix_Const2Name[] =
      "ultrix_const2";
 
@@ -4452,13 +4766,13 @@ tSCC zUltrix_Const2Select0[] =
        "\\*fopen\\( char \\*";
 
 #define    ULTRIX_CONST2_TEST_CT  1
-tTestDesc aUltrix_Const2Tests[] = {
+static tTestDesc aUltrix_Const2Tests[] = {
   { TT_EGREP,    zUltrix_Const2Select0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Const2
  */
-const char* apzUltrix_Const2Patch[] = {
+static const char* apzUltrix_Const2Patch[] = {
     "format",
     "%1( const char *%3, const char *",
     "([ \t*](fopen|sscanf|popen|tempnam))\\([ \t]*char[ \t]*\\*([^,]*),[ \t]*char[ \t]*\\*[ \t]*",
@@ -4468,7 +4782,6 @@ const char* apzUltrix_Const2Patch[] = {
  *
  *  Description of Ultrix_Fix_Fixproto fix
  */
-#define ULTRIX_FIX_FIXPROTO_FIXIDX       110
 tSCC zUltrix_Fix_FixprotoName[] =
      "ultrix_fix_fixproto";
 
@@ -4489,13 +4802,13 @@ tSCC zUltrix_Fix_FixprotoSelect0[] =
        "ULTRIX";
 
 #define    ULTRIX_FIX_FIXPROTO_TEST_CT  1
-tTestDesc aUltrix_Fix_FixprotoTests[] = {
+static tTestDesc aUltrix_Fix_FixprotoTests[] = {
   { TT_EGREP,    zUltrix_Fix_FixprotoSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Fix_Fixproto
  */
-const char* apzUltrix_Fix_FixprotoPatch[] = {
+static const char* apzUltrix_Fix_FixprotoPatch[] = {
     "format",
     "struct utsname;\n\
 %0",
@@ -4506,7 +4819,6 @@ const char* apzUltrix_Fix_FixprotoPatch[] = {
  *
  *  Description of Ultrix_Ifdef fix
  */
-#define ULTRIX_IFDEF_FIXIDX              111
 tSCC zUltrix_IfdefName[] =
      "ultrix_ifdef";
 
@@ -4527,13 +4839,13 @@ tSCC zUltrix_IfdefSelect0[] =
        "^#ifdef KERNEL[ \t]+&&";
 
 #define    ULTRIX_IFDEF_TEST_CT  1
-tTestDesc aUltrix_IfdefTests[] = {
+static tTestDesc aUltrix_IfdefTests[] = {
   { TT_EGREP,    zUltrix_IfdefSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Ifdef
  */
-const char* apzUltrix_IfdefPatch[] = {
+static const char* apzUltrix_IfdefPatch[] = {
     "format",
     "#if defined(KERNEL) &&",
     (char*)NULL };
@@ -4542,7 +4854,6 @@ const char* apzUltrix_IfdefPatch[] = {
  *
  *  Description of Ultrix_Math_Ifdef fix
  */
-#define ULTRIX_MATH_IFDEF_FIXIDX         112
 tSCC zUltrix_Math_IfdefName[] =
      "ultrix_math_ifdef";
 
@@ -4563,13 +4874,13 @@ tSCC zUltrix_Math_IfdefSelect0[] =
        "^(#if.*)\\|\\|[ \t]+CC\\$[a-z]+";
 
 #define    ULTRIX_MATH_IFDEF_TEST_CT  1
-tTestDesc aUltrix_Math_IfdefTests[] = {
+static tTestDesc aUltrix_Math_IfdefTests[] = {
   { TT_EGREP,    zUltrix_Math_IfdefSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Math_Ifdef
  */
-const char* apzUltrix_Math_IfdefPatch[] = {
+static const char* apzUltrix_Math_IfdefPatch[] = {
     "format",
     "%1",
     (char*)NULL };
@@ -4578,7 +4889,6 @@ const char* apzUltrix_Math_IfdefPatch[] = {
  *
  *  Description of Ultrix_Nested_Ioctl fix
  */
-#define ULTRIX_NESTED_IOCTL_FIXIDX       113
 tSCC zUltrix_Nested_IoctlName[] =
      "ultrix_nested_ioctl";
 
@@ -4599,13 +4909,13 @@ tSCC zUltrix_Nested_IoctlSelect0[] =
        "^/\\* #define SIOCSCREEN";
 
 #define    ULTRIX_NESTED_IOCTL_TEST_CT  1
-tTestDesc aUltrix_Nested_IoctlTests[] = {
+static tTestDesc aUltrix_Nested_IoctlTests[] = {
   { TT_EGREP,    zUltrix_Nested_IoctlSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Nested_Ioctl
  */
-const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
+static const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
     "-e", "/^\\/\\* #define SIOCSCREEN/s@/\\* screend@*//* screend@",
     (char*)NULL };
 
@@ -4613,7 +4923,6 @@ const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
  *
  *  Description of Ultrix_Nested_Svc fix
  */
-#define ULTRIX_NESTED_SVC_FIXIDX         114
 tSCC zUltrix_Nested_SvcName[] =
      "ultrix_nested_svc";
 
@@ -4634,13 +4943,13 @@ tSCC zUltrix_Nested_SvcSelect0[] =
        "^ \\*[ \t]*int protocol;  */\\*";
 
 #define    ULTRIX_NESTED_SVC_TEST_CT  1
-tTestDesc aUltrix_Nested_SvcTests[] = {
+static tTestDesc aUltrix_Nested_SvcTests[] = {
   { TT_EGREP,    zUltrix_Nested_SvcSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Nested_Svc
  */
-const char* apzUltrix_Nested_SvcPatch[] = { "sed",
+static const char* apzUltrix_Nested_SvcPatch[] = { "sed",
     "-e", "s@^\\( \\*\tint protocol;  \\)/\\*@\\1*/ /*@",
     (char*)NULL };
 
@@ -4648,7 +4957,6 @@ const char* apzUltrix_Nested_SvcPatch[] = { "sed",
  *
  *  Description of Ultrix_Stat fix
  */
-#define ULTRIX_STAT_FIXIDX               115
 tSCC zUltrix_StatName[] =
      "ultrix_stat";
 
@@ -4669,18 +4977,17 @@ tSCC zUltrix_StatSelect0[] =
        "@\\(#\\)stat\\.h.*6\\.1.*\\(ULTRIX\\)";
 
 #define    ULTRIX_STAT_TEST_CT  1
-tTestDesc aUltrix_StatTests[] = {
+static tTestDesc aUltrix_StatTests[] = {
   { TT_EGREP,    zUltrix_StatSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Stat
  */
-const char* apzUltrix_StatPatch[] = { "sed",
+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 };
@@ -4689,7 +4996,6 @@ const char* apzUltrix_StatPatch[] = { "sed",
  *
  *  Description of Ultrix_Static fix
  */
-#define ULTRIX_STATIC_FIXIDX             116
 tSCC zUltrix_StaticName[] =
      "ultrix_static";
 
@@ -4710,13 +5016,13 @@ tSCC zUltrix_StaticSelect0[] =
        "#include \"r[34]_cpu";
 
 #define    ULTRIX_STATIC_TEST_CT  1
-tTestDesc aUltrix_StaticTests[] = {
+static tTestDesc aUltrix_StaticTests[] = {
   { TT_EGREP,    zUltrix_StaticSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Static
  */
-const char* apzUltrix_StaticPatch[] = { "sed",
+static const char* apzUltrix_StaticPatch[] = { "sed",
     "-e", "s/^static struct tlb_pid_state/struct tlb_pid_state/",
     "-e", "s/^#include \"r3_cpu\\.h\"$/#include <machine\\/r3_cpu\\.h>/",
     "-e", "s/^#include \"r4_cpu\\.h\"$/#include <machine\\/r4_cpu\\.h>/",
@@ -4726,7 +5032,6 @@ const char* apzUltrix_StaticPatch[] = { "sed",
  *
  *  Description of Ultrix_Strings fix
  */
-#define ULTRIX_STRINGS_FIXIDX            117
 tSCC zUltrix_StringsName[] =
      "ultrix_strings";
 
@@ -4747,13 +5052,13 @@ tSCC zUltrix_StringsSelect0[] =
        "@\\(#\\)strings\\.h.*6\\.1.*\\(ULTRIX\\)";
 
 #define    ULTRIX_STRINGS_TEST_CT  1
-tTestDesc aUltrix_StringsTests[] = {
+static tTestDesc aUltrix_StringsTests[] = {
   { TT_EGREP,    zUltrix_StringsSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Ultrix_Strings
  */
-const char* apzUltrix_StringsPatch[] = {
+static const char* apzUltrix_StringsPatch[] = {
     "wrap",
     (char*)NULL };
 
@@ -4761,7 +5066,6 @@ const char* apzUltrix_StringsPatch[] = {
  *
  *  Description of Undefine_Null fix
  */
-#define UNDEFINE_NULL_FIXIDX             118
 tSCC zUndefine_NullName[] =
      "undefine_null";
 
@@ -4787,14 +5091,14 @@ tSCC zUndefine_NullBypass0[] =
        "#[ \t]*(ifn|un)def[ \t]+NULL($|[ \t\r])";
 
 #define    UNDEFINE_NULL_TEST_CT  2
-tTestDesc aUndefine_NullTests[] = {
+static tTestDesc aUndefine_NullTests[] = {
   { TT_NEGREP,   zUndefine_NullBypass0, (regex_t*)NULL },
   { TT_EGREP,    zUndefine_NullSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Undefine_Null
  */
-const char* apzUndefine_NullPatch[] = {
+static const char* apzUndefine_NullPatch[] = {
     "format",
     "#ifndef NULL%2\n\
 #define NULL%1%2\n\
@@ -4805,21 +5109,57 @@ const char* apzUndefine_NullPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Unixware7_Byteorder_Fix fix
+ *  Description of Unicosmk_Restrict fix
+ */
+tSCC zUnicosmk_RestrictName[] =
+     "unicosmk_restrict";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zUnicosmk_RestrictList[] =
+  "|stdio.h|stdlib.h|wchar.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzUnicosmk_RestrictMachs[] = {
+        "*-*-unicosmk*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zUnicosmk_RestrictSelect0[] =
+       "(\\*[ \t]*)restrict([ \t]+)";
+
+#define    UNICOSMK_RESTRICT_TEST_CT  1
+static tTestDesc aUnicosmk_RestrictTests[] = {
+  { TT_EGREP,    zUnicosmk_RestrictSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Unicosmk_Restrict
+ */
+static const char* apzUnicosmk_RestrictPatch[] = {
+    "format",
+    "%1__restrict__%2",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Uw7_Byteorder_Fix fix
  */
-#define UNIXWARE7_BYTEORDER_FIX_FIXIDX   119
-tSCC zUnixware7_Byteorder_FixName[] =
-     "unixware7_byteorder_fix";
+tSCC zUw7_Byteorder_FixName[] =
+     "uw7_byteorder_fix";
 
 /*
  *  File name selection pattern
  */
-tSCC zUnixware7_Byteorder_FixList[] =
+tSCC zUw7_Byteorder_FixList[] =
   "|arpa/inet.h|";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzUnixware7_Byteorder_FixMachs[] = {
+tSCC* apzUw7_Byteorder_FixMachs[] = {
         "*-*-sysv4*",
         "i?86-*-sysv5*",
         "i?86-*-udk*",
@@ -4831,26 +5171,33 @@ tSCC* apzUnixware7_Byteorder_FixMachs[] = {
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zUnixware7_Byteorder_FixSelect0[] =
+tSCC zUw7_Byteorder_FixSelect0[] =
        "in_port_t";
 
-#define    UNIXWARE7_BYTEORDER_FIX_TEST_CT  1
-tTestDesc aUnixware7_Byteorder_FixTests[] = {
-  { TT_EGREP,    zUnixware7_Byteorder_FixSelect0, (regex_t*)NULL }, };
+/*
+ *  perform the 'test' shell command - do fix on success
+ */
+tSCC zUw7_Byteorder_FixTest0[] =
+       "-f sys/byteorder.h";
+
+#define    UW7_BYTEORDER_FIX_TEST_CT  2
+static tTestDesc aUw7_Byteorder_FixTests[] = {
+  { TT_TEST,     zUw7_Byteorder_FixTest0,   0 /* unused */ },
+  { TT_EGREP,    zUw7_Byteorder_FixSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Unixware7_Byteorder_Fix
+ *  Fix Command Arguments for Uw7_Byteorder_Fix
  */
-const char* apzUnixware7_Byteorder_FixPatch[] = { "sed",
-    "-e", "/^extern.*htons.*(in_port_t)/d",
-    "-e", "/^extern.*ntohs.*(in_port_t)/d",
+static const char* apzUw7_Byteorder_FixPatch[] = {
+    "format",
+    "",
+    "^extern.*[ \t](htons|ntohs).*\\(in_port_t\\).*;",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Va_I960_Macro fix
  */
-#define VA_I960_MACRO_FIXIDX             120
 tSCC zVa_I960_MacroName[] =
      "va_i960_macro";
 
@@ -4871,13 +5218,13 @@ tSCC zVa_I960_MacroSelect0[] =
        "__(vsiz|vali|vpad|alignof__)";
 
 #define    VA_I960_MACRO_TEST_CT  1
-tTestDesc aVa_I960_MacroTests[] = {
+static tTestDesc aVa_I960_MacroTests[] = {
   { TT_EGREP,    zVa_I960_MacroSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Va_I960_Macro
  */
-const char* apzVa_I960_MacroPatch[] = {
+static const char* apzVa_I960_MacroPatch[] = {
     "format",
     "__vx%1",
     (char*)NULL };
@@ -4886,7 +5233,6 @@ const char* apzVa_I960_MacroPatch[] = {
  *
  *  Description of Void_Null fix
  */
-#define VOID_NULL_FIXIDX                 121
 tSCC zVoid_NullName[] =
      "void_null";
 
@@ -4907,13 +5253,13 @@ tSCC zVoid_NullSelect0[] =
        "^#[ \t]*define[ \t]+NULL[ \t]+\\(\\(void[ \t]*\\*\\)0\\)";
 
 #define    VOID_NULL_TEST_CT  1
-tTestDesc aVoid_NullTests[] = {
+static tTestDesc aVoid_NullTests[] = {
   { TT_EGREP,    zVoid_NullSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Void_Null
  */
-const char* apzVoid_NullPatch[] = {
+static const char* apzVoid_NullPatch[] = {
     "format",
     "#define NULL 0",
     (char*)NULL };
@@ -4922,7 +5268,6 @@ const char* apzVoid_NullPatch[] = {
  *
  *  Description of Vxworks_Gcc_Problem fix
  */
-#define VXWORKS_GCC_PROBLEM_FIXIDX       122
 tSCC zVxworks_Gcc_ProblemName[] =
      "vxworks_gcc_problem";
 
@@ -4943,13 +5288,13 @@ tSCC zVxworks_Gcc_ProblemSelect0[] =
        "__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__";
 
 #define    VXWORKS_GCC_PROBLEM_TEST_CT  1
-tTestDesc aVxworks_Gcc_ProblemTests[] = {
+static tTestDesc aVxworks_Gcc_ProblemTests[] = {
   { TT_EGREP,    zVxworks_Gcc_ProblemSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Vxworks_Gcc_Problem
  */
-const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
+static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
     "-e", "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/",
     "-e", "/[ \t]size_t/i\\\n\
 #ifndef _GCC_SIZE_T\\\n\
@@ -4972,7 +5317,6 @@ const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
  *
  *  Description of Vxworks_Needs_Vxtypes fix
  */
-#define VXWORKS_NEEDS_VXTYPES_FIXIDX     123
 tSCC zVxworks_Needs_VxtypesName[] =
      "vxworks_needs_vxtypes";
 
@@ -4993,13 +5337,13 @@ tSCC zVxworks_Needs_VxtypesSelect0[] =
        "uint_t([ \t]+_clocks_per_sec)";
 
 #define    VXWORKS_NEEDS_VXTYPES_TEST_CT  1
-tTestDesc aVxworks_Needs_VxtypesTests[] = {
+static tTestDesc aVxworks_Needs_VxtypesTests[] = {
   { TT_EGREP,    zVxworks_Needs_VxtypesSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Vxworks_Needs_Vxtypes
  */
-const char* apzVxworks_Needs_VxtypesPatch[] = {
+static const char* apzVxworks_Needs_VxtypesPatch[] = {
     "format",
     "unsigned int%1",
     (char*)NULL };
@@ -5008,7 +5352,6 @@ const char* apzVxworks_Needs_VxtypesPatch[] = {
  *
  *  Description of Vxworks_Needs_Vxworks fix
  */
-#define VXWORKS_NEEDS_VXWORKS_FIXIDX     124
 tSCC zVxworks_Needs_VxworksName[] =
      "vxworks_needs_vxworks";
 
@@ -5039,7 +5382,7 @@ tSCC zVxworks_Needs_VxworksTest2[] =
        " -n \"`egrep ULONG $file`\"";
 
 #define    VXWORKS_NEEDS_VXWORKS_TEST_CT  4
-tTestDesc aVxworks_Needs_VxworksTests[] = {
+static tTestDesc aVxworks_Needs_VxworksTests[] = {
   { TT_TEST,     zVxworks_Needs_VxworksTest0,   0 /* unused */ },
   { TT_TEST,     zVxworks_Needs_VxworksTest1,   0 /* unused */ },
   { TT_TEST,     zVxworks_Needs_VxworksTest2,   0 /* unused */ },
@@ -5048,7 +5391,7 @@ tTestDesc aVxworks_Needs_VxworksTests[] = {
 /*
  *  Fix Command Arguments for Vxworks_Needs_Vxworks
  */
-const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
+static const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
     "-e", "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n\
 #include <types/vxTypesOld.h>\n",
     (char*)NULL };
@@ -5057,7 +5400,6 @@ const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
  *
  *  Description of Vxworks_Time fix
  */
-#define VXWORKS_TIME_FIXIDX              125
 tSCC zVxworks_TimeName[] =
      "vxworks_time";
 
@@ -5084,14 +5426,14 @@ tSCC zVxworks_TimeTest0[] =
        " -r vxWorks.h";
 
 #define    VXWORKS_TIME_TEST_CT  2
-tTestDesc aVxworks_TimeTests[] = {
+static tTestDesc aVxworks_TimeTests[] = {
   { TT_TEST,     zVxworks_TimeTest0,   0 /* unused */ },
   { TT_EGREP,    zVxworks_TimeSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Vxworks_Time
  */
-const char* apzVxworks_TimePatch[] = {
+static const char* apzVxworks_TimePatch[] = {
     "format",
     "#ifndef __gcc_VOIDFUNCPTR_defined\n\
 #ifdef __cplusplus\n\
@@ -5106,9 +5448,99 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Windiss_Math1 fix
+ */
+tSCC zWindiss_Math1Name[] =
+     "windiss_math1";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zWindiss_Math1List[] =
+  "|math.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzWindiss_Math1Machs[] = {
+        "*-*-windiss",
+        (const char*)NULL };
+#define WINDISS_MATH1_TEST_CT  0
+#define aWindiss_Math1Tests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Windiss_Math1
+ */
+static const char* apzWindiss_Math1Patch[] = { "sed",
+    "-e", "s|inline long double cosl.*|#ifndef __GNUC__|",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Windiss_Math2 fix
+ */
+tSCC zWindiss_Math2Name[] =
+     "windiss_math2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zWindiss_Math2List[] =
+  "|math.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzWindiss_Math2Machs[] = {
+        "*-*-windiss",
+        (const char*)NULL };
+#define WINDISS_MATH2_TEST_CT  0
+#define aWindiss_Math2Tests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Windiss_Math2
+ */
+static const char* apzWindiss_Math2Patch[] = { "sed",
+    "-e", "s|/\\* long double declarations \\*/|#endif /* __GNUC__ */|",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Windiss_Valist fix
+ */
+tSCC zWindiss_ValistName[] =
+     "windiss_valist";
+
+/*
+ *  File name selection pattern
+ */
+#define zWindiss_ValistList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzWindiss_ValistMachs[] = {
+        "*-*-windiss",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zWindiss_ValistSelect0[] =
+       "(#include.*)diab/va_list.h";
+
+#define    WINDISS_VALIST_TEST_CT  1
+static tTestDesc aWindiss_ValistTests[] = {
+  { TT_EGREP,    zWindiss_ValistSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Windiss_Valist
+ */
+static const char* apzWindiss_ValistPatch[] = { "sed",
+    "-e", "s|diab/va_list.h|stdarg.h|",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of X11_Class fix
  */
-#define X11_CLASS_FIXIDX                 126
 tSCC zX11_ClassName[] =
      "x11_class";
 
@@ -5135,14 +5567,14 @@ tSCC zX11_ClassBypass0[] =
        "__cplusplus";
 
 #define    X11_CLASS_TEST_CT  2
-tTestDesc aX11_ClassTests[] = {
+static tTestDesc aX11_ClassTests[] = {
   { TT_NEGREP,   zX11_ClassBypass0, (regex_t*)NULL },
   { TT_EGREP,    zX11_ClassSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for X11_Class
  */
-const char* apzX11_ClassPatch[] = {
+static const char* apzX11_ClassPatch[] = {
     "format",
     "#ifdef __cplusplus\n\
 %1c_class;%2\n\
@@ -5155,7 +5587,6 @@ const char* apzX11_ClassPatch[] = {
  *
  *  Description of X11_Class_Usage fix
  */
-#define X11_CLASS_USAGE_FIXIDX           127
 tSCC zX11_Class_UsageName[] =
      "x11_class_usage";
 
@@ -5182,14 +5613,14 @@ tSCC zX11_Class_UsageBypass0[] =
        "__cplusplus";
 
 #define    X11_CLASS_USAGE_TEST_CT  2
-tTestDesc aX11_Class_UsageTests[] = {
+static tTestDesc aX11_Class_UsageTests[] = {
   { TT_NEGREP,   zX11_Class_UsageBypass0, (regex_t*)NULL },
   { TT_EGREP,    zX11_Class_UsageSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for X11_Class_Usage
  */
-const char* apzX11_Class_UsagePatch[] = {
+static const char* apzX11_Class_UsagePatch[] = {
     "format",
     " c_class)",
     (char*)NULL };
@@ -5198,7 +5629,6 @@ const char* apzX11_Class_UsagePatch[] = {
  *
  *  Description of X11_New fix
  */
-#define X11_NEW_FIXIDX                   128
 tSCC zX11_NewName[] =
      "x11_new";
 
@@ -5219,13 +5649,13 @@ tSCC zX11_NewBypass0[] =
        "__cplusplus";
 
 #define    X11_NEW_TEST_CT  1
-tTestDesc aX11_NewTests[] = {
+static tTestDesc aX11_NewTests[] = {
   { TT_NEGREP,   zX11_NewBypass0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for X11_New
  */
-const char* apzX11_NewPatch[] = { "sed",
+static const char* apzX11_NewPatch[] = { "sed",
     "-e", "/Widget\told, new;/i\\\n\
 #ifdef __cplusplus\\\n\
 \tWidget\told, c_new;\\\n\
@@ -5239,7 +5669,6 @@ const char* apzX11_NewPatch[] = { "sed",
  *
  *  Description of X11_Sprintf fix
  */
-#define X11_SPRINTF_FIXIDX               129
 tSCC zX11_SprintfName[] =
      "x11_sprintf";
 
@@ -5260,13 +5689,13 @@ tSCC zX11_SprintfSelect0[] =
        "^extern char \\*\tsprintf\\(\\);$";
 
 #define    X11_SPRINTF_TEST_CT  1
-tTestDesc aX11_SprintfTests[] = {
+static tTestDesc aX11_SprintfTests[] = {
   { TT_EGREP,    zX11_SprintfSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for X11_Sprintf
  */
-const char* apzX11_SprintfPatch[] = {
+static const char* apzX11_SprintfPatch[] = {
     "format",
     "#ifndef __STDC__\n\
 %0\n\
@@ -5278,658 +5707,890 @@ const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          132
+#define REGEX_COUNT          153
 #define MACH_LIST_SIZE_LIMIT 279
-#define FIX_COUNT            130
+#define FIX_COUNT            146
+
+/*
+ *  Enumerate the fixes
+ */
+typedef enum {
+    AAB_DGUX_INT_VARARGS_FIXIDX,
+    AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX,
+    AAB_FD_ZERO_GNU_TYPES_H_FIXIDX,
+    AAB_FD_ZERO_SELECTBITS_H_FIXIDX,
+    AAB_SUN_MEMCPY_FIXIDX,
+    AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
+    AAB_SVR4_REPLACE_BYTEORDER_FIXIDX,
+    AAB_ULTRIX_ANSI_COMPAT_FIXIDX,
+    AAB_ULTRIX_LIMITS_FIXIDX,
+    AAB_ULTRIX_MEMORY_FIXIDX,
+    AAB_ULTRIX_STRING_FIXIDX,
+    AIX_PTHREAD_FIXIDX,
+    AIX_SYSMACHINE_FIXIDX,
+    AIX_SYSWAIT_FIXIDX,
+    AIX_VOLATILE_FIXIDX,
+    ALPHA___ASSERT_FIXIDX,
+    ALPHA_ASSERT_FIXIDX,
+    ALPHA_GETOPT_FIXIDX,
+    ALPHA_PARENS_FIXIDX,
+    ALPHA_SBRK_FIXIDX,
+    ARM_NORCROFT_HINT_FIXIDX,
+    ARM_WCHAR_FIXIDX,
+    AUX_ASM_FIXIDX,
+    AVOID_BOOL_DEFINE_FIXIDX,
+    AVOID_BOOL_TYPE_FIXIDX,
+    AVOID_WCHAR_T_TYPE_FIXIDX,
+    BAD_LVAL_FIXIDX,
+    BAD_STRUCT_TERM_FIXIDX,
+    BADQUOTE_FIXIDX,
+    BROKEN_ASSERT_STDIO_FIXIDX,
+    BROKEN_ASSERT_STDLIB_FIXIDX,
+    BROKEN_CABS_FIXIDX,
+    CTRL_QUOTES_DEF_FIXIDX,
+    CTRL_QUOTES_USE_FIXIDX,
+    CXX_UNREADY_FIXIDX,
+    DEC_INTERN_ASM_FIXIDX,
+    DJGPP_WCHAR_H_FIXIDX,
+    ECD_CURSOR_FIXIDX,
+    FIX_HEADER_BREAKAGE_FIXIDX,
+    FREEBSD_GCC3_BREAKAGE_FIXIDX,
+    GNU_TYPES_FIXIDX,
+    HP_INLINE_FIXIDX,
+    HP_SYSFILE_FIXIDX,
+    HPUX10_CPP_POW_INLINE_FIXIDX,
+    HPUX11_CPP_POW_INLINE_FIXIDX,
+    HPUX11_FABSF_FIXIDX,
+    HPUX11_SIZE_T_FIXIDX,
+    HPUX11_UINT32_C_FIXIDX,
+    HPUX11_VSNPRINTF_FIXIDX,
+    HPUX8_BOGUS_INLINES_FIXIDX,
+    HPUX_MAXINT_FIXIDX,
+    HPUX_SYSTIME_FIXIDX,
+    INT_ABORT_FREE_AND_EXIT_FIXIDX,
+    IO_QUOTES_DEF_FIXIDX,
+    IO_QUOTES_USE_FIXIDX,
+    IP_MISSING_SEMI_FIXIDX,
+    IRIX_ASM_APOSTROPHE_FIXIDX,
+    IRIX_LIMITS_CONST_FIXIDX,
+    IRIX_STDIO_VA_LIST_FIXIDX,
+    ISC_FMOD_FIXIDX,
+    ISC_OMITS_WITH_STDC_FIXIDX,
+    KANDR_CONCAT_FIXIDX,
+    LIBC1_IFDEFD_MEMX_FIXIDX,
+    LIMITS_IFNDEFS_FIXIDX,
+    LYNX_VOID_INT_FIXIDX,
+    LYNXOS_FCNTL_PROTO_FIXIDX,
+    M88K_BAD_HYPOT_OPT_FIXIDX,
+    M88K_BAD_S_IF_FIXIDX,
+    M88K_MULTI_INCL_FIXIDX,
+    MACHINE_ANSI_H_VA_LIST_FIXIDX,
+    MACHINE_NAME_FIXIDX,
+    MATH_EXCEPTION_FIXIDX,
+    MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX,
+    MATH_HUGE_VAL_IFNDEF_FIXIDX,
+    NESTED_AUTH_DES_FIXIDX,
+    NESTED_MOTOROLA_FIXIDX,
+    NESTED_SYS_LIMITS_FIXIDX,
+    NEWS_OS_RECURSION_FIXIDX,
+    NEXT_MATH_PREFIX_FIXIDX,
+    NEXT_TEMPLATE_FIXIDX,
+    NEXT_VOLITILE_FIXIDX,
+    NEXT_WAIT_UNION_FIXIDX,
+    NODEENT_SYNTAX_FIXIDX,
+    OSF_NAMESPACE_A_FIXIDX,
+    OSF_NAMESPACE_C_FIXIDX,
+    PTHREAD_PAGE_SIZE_FIXIDX,
+    READ_RET_TYPE_FIXIDX,
+    RS6000_DOUBLE_FIXIDX,
+    RS6000_FCHMOD_FIXIDX,
+    RS6000_PARAM_FIXIDX,
+    SCO_STATIC_FUNC_FIXIDX,
+    SCO_UTIME_FIXIDX,
+    SOLARIS_MUTEX_INIT_FIXIDX,
+    SOLARIS_STDIO_TAG_FIXIDX,
+    SOLARIS_WIDEC_FIXIDX,
+    STATSSWTCH_FIXIDX,
+    STDIO_STDARG_H_FIXIDX,
+    STDIO_VA_LIST_FIXIDX,
+    STRICT_ANSI_NOT_FIXIDX,
+    STRICT_ANSI_NOT_CTD_FIXIDX,
+    STRICT_ANSI_ONLY_FIXIDX,
+    STRUCT_FILE_FIXIDX,
+    STRUCT_SOCKADDR_FIXIDX,
+    SUN_AUTH_PROTO_FIXIDX,
+    SUN_BOGUS_IFDEF_FIXIDX,
+    SUN_CATMACRO_FIXIDX,
+    SUN_MALLOC_FIXIDX,
+    SUN_RUSERS_SEMI_FIXIDX,
+    SUN_SIGNAL_FIXIDX,
+    SUNOS_MATHERR_DECL_FIXIDX,
+    SUNOS_STRLEN_FIXIDX,
+    SVR4__P_FIXIDX,
+    SVR4_GETCWD_FIXIDX,
+    SVR4_PROFIL_FIXIDX,
+    SYSV68_STRING_FIXIDX,
+    SYSZ_STDLIB_FOR_SUN_FIXIDX,
+    THREAD_KEYWORD_FIXIDX,
+    TINFO_CPLUSPLUS_FIXIDX,
+    ULTRIX_ATEXIT_PARAM_FIXIDX,
+    ULTRIX_ATOF_PARAM_FIXIDX,
+    ULTRIX_CONST_FIXIDX,
+    ULTRIX_CONST2_FIXIDX,
+    ULTRIX_FIX_FIXPROTO_FIXIDX,
+    ULTRIX_IFDEF_FIXIDX,
+    ULTRIX_MATH_IFDEF_FIXIDX,
+    ULTRIX_NESTED_IOCTL_FIXIDX,
+    ULTRIX_NESTED_SVC_FIXIDX,
+    ULTRIX_STAT_FIXIDX,
+    ULTRIX_STATIC_FIXIDX,
+    ULTRIX_STRINGS_FIXIDX,
+    UNDEFINE_NULL_FIXIDX,
+    UNICOSMK_RESTRICT_FIXIDX,
+    UW7_BYTEORDER_FIX_FIXIDX,
+    VA_I960_MACRO_FIXIDX,
+    VOID_NULL_FIXIDX,
+    VXWORKS_GCC_PROBLEM_FIXIDX,
+    VXWORKS_NEEDS_VXTYPES_FIXIDX,
+    VXWORKS_NEEDS_VXWORKS_FIXIDX,
+    VXWORKS_TIME_FIXIDX,
+    WINDISS_MATH1_FIXIDX,
+    WINDISS_MATH2_FIXIDX,
+    WINDISS_VALIST_FIXIDX,
+    X11_CLASS_FIXIDX,
+    X11_CLASS_USAGE_FIXIDX,
+    X11_NEW_FIXIDX,
+    X11_SPRINTF_FIXIDX
+} t_fixinc_idx;
 
 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 },
-
-  {  zAaa_KiName,    zAaa_KiList,
-     apzAaa_KiMachs,
-     AAA_KI_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_KiTests,   apzAaa_KiPatch },
-
-  {  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 },
-
-  {  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 },
-
-  {  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 },
-
-  {  zAaa_TimeName,    zAaa_TimeList,
-     apzAaa_TimeMachs,
-     AAA_TIME_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_TimeTests,   apzAaa_TimePatch },
-
   {  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_Solaris_Sys_Varargs_HName,    zAab_Solaris_Sys_Varargs_HList,
+     apzAab_Solaris_Sys_Varargs_HMachs,
+     AAB_SOLARIS_SYS_VARARGS_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+     aAab_Solaris_Sys_Varargs_HTests,   apzAab_Solaris_Sys_Varargs_HPatch, 0 },
 
   {  zAab_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, 0 },
+
+  {  zAix_SysmachineName,    zAix_SysmachineList,
+     apzAix_SysmachineMachs,
+     AIX_SYSMACHINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_SysmachineTests,   apzAix_SysmachinePatch, 0 },
 
   {  zAix_SyswaitName,    zAix_SyswaitList,
      apzAix_SyswaitMachs,
      AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAix_SyswaitTests,   apzAix_SyswaitPatch },
+     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_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, 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 },
+
+  {  zGnu_TypesName,    zGnu_TypesList,
+     apzGnu_TypesMachs,
+     GNU_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aGnu_TypesTests,   apzGnu_TypesPatch, 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 },
+
+  {  zHpux10_Cpp_Pow_InlineName,    zHpux10_Cpp_Pow_InlineList,
+     apzHpux10_Cpp_Pow_InlineMachs,
+     HPUX10_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux10_Cpp_Pow_InlineTests,   apzHpux10_Cpp_Pow_InlinePatch, 0 },
+
+  {  zHpux11_Cpp_Pow_InlineName,    zHpux11_Cpp_Pow_InlineList,
+     apzHpux11_Cpp_Pow_InlineMachs,
+     HPUX11_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_Cpp_Pow_InlineTests,   apzHpux11_Cpp_Pow_InlinePatch, 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_Size_TName,    zHpux11_Size_TList,
+     apzHpux11_Size_TMachs,
+     HPUX11_SIZE_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_Size_TTests,   apzHpux11_Size_TPatch, 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 },
+
+  {  zHpux11_VsnprintfName,    zHpux11_VsnprintfList,
+     apzHpux11_VsnprintfMachs,
+     HPUX11_VSNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_VsnprintfTests,   apzHpux11_VsnprintfPatch, 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 },
+
+  {  zHpux_MaxintName,    zHpux_MaxintList,
+     apzHpux_MaxintMachs,
+     HPUX_MAXINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_MaxintTests,   apzHpux_MaxintPatch, 0 },
+
+  {  zHpux_SystimeName,    zHpux_SystimeList,
+     apzHpux_SystimeMachs,
+     HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_SystimeTests,   apzHpux_SystimePatch, 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 },
-
-  {  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 },
+     aInt_Abort_Free_And_ExitTests,   apzInt_Abort_Free_And_ExitPatch, 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 },
-
-  {  zHpux_MaxintName,    zHpux_MaxintList,
-     apzHpux_MaxintMachs,
-     HPUX_MAXINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_MaxintTests,   apzHpux_MaxintPatch },
-
-  {  zHpux_SystimeName,    zHpux_SystimeList,
-     apzHpux_SystimeMachs,
-     HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_SystimeTests,   apzHpux_SystimePatch },
+     aIo_Quotes_UseTests,   apzIo_Quotes_UsePatch, 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_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 },
+
+  {  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 },
 
   {  zIsc_FmodName,    zIsc_FmodList,
      apzIsc_FmodMachs,
      ISC_FMOD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIsc_FmodTests,   apzIsc_FmodPatch },
+     aIsc_FmodTests,   apzIsc_FmodPatch, 0 },
+
+  {  zIsc_Omits_With_StdcName,    zIsc_Omits_With_StdcList,
+     apzIsc_Omits_With_StdcMachs,
+     ISC_OMITS_WITH_STDC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aIsc_Omits_With_StdcTests,   apzIsc_Omits_With_StdcPatch, 0 },
 
   {  zKandr_ConcatName,    zKandr_ConcatList,
      apzKandr_ConcatMachs,
      KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aKandr_ConcatTests,   apzKandr_ConcatPatch },
+     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_Auth_DesName,    zNested_Auth_DesList,
+     apzNested_Auth_DesMachs,
+     NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aNested_Auth_DesTests,   apzNested_Auth_DesPatch, 0 },
 
   {  zNested_MotorolaName,    zNested_MotorolaList,
      apzNested_MotorolaMachs,
      NESTED_MOTOROLA_TEST_CT, FD_MACH_ONLY,
-     aNested_MotorolaTests,   apzNested_MotorolaPatch },
+     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 },
-
-  {  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_Sys_LimitsTests,   apzNested_Sys_LimitsPatch, 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 },
-
-  {  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 },
+     aSco_Static_FuncTests,   apzSco_Static_FuncPatch, 0 },
 
   {  zSco_UtimeName,    zSco_UtimeList,
      apzSco_UtimeMachs,
      SCO_UTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSco_UtimeTests,   apzSco_UtimePatch },
+     aSco_UtimeTests,   apzSco_UtimePatch, 0 },
 
-  {  zSony_IncludeName,    zSony_IncludeList,
-     apzSony_IncludeMachs,
-     SONY_INCLUDE_TEST_CT, FD_MACH_ONLY,
-     aSony_IncludeTests,   apzSony_IncludePatch },
+  {  zSolaris_Mutex_InitName,    zSolaris_Mutex_InitList,
+     apzSolaris_Mutex_InitMachs,
+     SOLARIS_MUTEX_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Mutex_InitTests,   apzSolaris_Mutex_InitPatch, 0 },
+
+  {  zSolaris_Stdio_TagName,    zSolaris_Stdio_TagList,
+     apzSolaris_Stdio_TagMachs,
+     SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,
+     aSolaris_Stdio_TagTests,   apzSolaris_Stdio_TagPatch, 0 },
+
+  {  zSolaris_WidecName,    zSolaris_WidecList,
+     apzSolaris_WidecMachs,
+     SOLARIS_WIDEC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_WidecTests,   apzSolaris_WidecPatch, 0 },
 
   {  zStatsswtchName,    zStatsswtchList,
      apzStatsswtchMachs,
      STATSSWTCH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     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 },
+
+  {  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 },
 
   {  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 },
-
-  {  zSystypesName,    zSystypesList,
-     apzSystypesMachs,
-     SYSTYPES_TEST_CT, FD_MACH_ONLY,
-     aSystypesTests,   apzSystypesPatch },
-
-  {  zSystypes_Stdlib_Size_TName,    zSystypes_Stdlib_Size_TList,
-     apzSystypes_Stdlib_Size_TMachs,
-     SYSTYPES_STDLIB_SIZE_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSystypes_Stdlib_Size_TTests,   apzSystypes_Stdlib_Size_TPatch },
+     aSvr4_ProfilTests,   apzSvr4_ProfilPatch, 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 },
 
-  {  zSysz_Stdtypes_For_SunName,    zSysz_Stdtypes_For_SunList,
-     apzSysz_Stdtypes_For_SunMachs,
-     SYSZ_STDTYPES_FOR_SUN_TEST_CT, FD_MACH_ONLY,
-     aSysz_Stdtypes_For_SunTests,   apzSysz_Stdtypes_For_SunPatch },
+  {  zThread_KeywordName,    zThread_KeywordList,
+     apzThread_KeywordMachs,
+     THREAD_KEYWORD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aThread_KeywordTests,   apzThread_KeywordPatch, 0 },
 
   {  zTinfo_CplusplusName,    zTinfo_CplusplusList,
      apzTinfo_CplusplusMachs,
      TINFO_CPLUSPLUS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aTinfo_CplusplusTests,   apzTinfo_CplusplusPatch },
+     aTinfo_CplusplusTests,   apzTinfo_CplusplusPatch, 0 },
+
+  {  zUltrix_Atexit_ParamName,    zUltrix_Atexit_ParamList,
+     apzUltrix_Atexit_ParamMachs,
+     ULTRIX_ATEXIT_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aUltrix_Atexit_ParamTests,   apzUltrix_Atexit_ParamPatch, 0 },
 
   {  zUltrix_Atof_ParamName,    zUltrix_Atof_ParamList,
      apzUltrix_Atof_ParamMachs,
      ULTRIX_ATOF_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_Atof_ParamTests,   apzUltrix_Atof_ParamPatch },
+     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 },
 
-  {  zUnixware7_Byteorder_FixName,    zUnixware7_Byteorder_FixList,
-     apzUnixware7_Byteorder_FixMachs,
-     UNIXWARE7_BYTEORDER_FIX_TEST_CT, FD_MACH_ONLY,
-     aUnixware7_Byteorder_FixTests,   apzUnixware7_Byteorder_FixPatch },
+  {  zUnicosmk_RestrictName,    zUnicosmk_RestrictList,
+     apzUnicosmk_RestrictMachs,
+     UNICOSMK_RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aUnicosmk_RestrictTests,   apzUnicosmk_RestrictPatch, 0 },
+
+  {  zUw7_Byteorder_FixName,    zUw7_Byteorder_FixList,
+     apzUw7_Byteorder_FixMachs,
+     UW7_BYTEORDER_FIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aUw7_Byteorder_FixTests,   apzUw7_Byteorder_FixPatch, 0 },
 
   {  zVa_I960_MacroName,    zVa_I960_MacroList,
      apzVa_I960_MacroMachs,
      VA_I960_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     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 },
+
+  {  zWindiss_Math1Name,    zWindiss_Math1List,
+     apzWindiss_Math1Machs,
+     WINDISS_MATH1_TEST_CT, FD_MACH_ONLY,
+     aWindiss_Math1Tests,   apzWindiss_Math1Patch, 0 },
+
+  {  zWindiss_Math2Name,    zWindiss_Math2List,
+     apzWindiss_Math2Machs,
+     WINDISS_MATH2_TEST_CT, FD_MACH_ONLY,
+     aWindiss_Math2Tests,   apzWindiss_Math2Patch, 0 },
+
+  {  zWindiss_ValistName,    zWindiss_ValistList,
+     apzWindiss_ValistMachs,
+     WINDISS_VALIST_TEST_CT, FD_MACH_ONLY,
+     aWindiss_ValistTests,   apzWindiss_ValistPatch, 0 },
 
   {  zX11_ClassName,    zX11_ClassList,
      apzX11_ClassMachs,
      X11_CLASS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     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 }
 };