[libgomp, nvptx] Remove hard-coded const in nvptx_open_device
[gcc.git] / fixincludes / fixincl.x
index d9117d8e3fd5bf8575b38beb286c3a0fab1c3eae..a5d7884a62ae86c47b99b874bd1e546a258f24b0 100644 (file)
@@ -1,12 +1,12 @@
 /*  -*- buffer-read-only: t -*- vi: set ro:
- * 
+ *
  * DO NOT EDIT THIS FILE   (fixincl.x)
- * 
- * It has been AutoGen-ed  Monday November  8, 2010 at 08:33:47 PM MET
+ *
+ * It has been AutoGen-ed  July 23, 2018 at 07:27:34 PM by AutoGen 5.18
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Nov  8 20:33:47 MET 2010
+/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Jul 23 19:27:34 UTC 2018
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -15,7 +15,7 @@
  * certain ANSI-incompatible system header files which are fixed to work
  * correctly with ANSI C and placed in a directory that GNU C will search.
  *
- * This file contains 210 fixup descriptions.
+ * This file contains 251 fixup descriptions.
  *
  * See README for more information.
  *
@@ -99,6 +99,60 @@ extern off64_t ftello(FILE *) __asm__(\"ftello64\");\n\
 #endif\n",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aab_Aix_Fcntl fix
+ */
+tSCC zAab_Aix_FcntlName[] =
+     "AAB_aix_fcntl";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAab_Aix_FcntlList[] =
+  "fcntl.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAab_Aix_FcntlMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAab_Aix_FcntlSelect0[] =
+       "define open[ \t]open64";
+
+#define    AAB_AIX_FCNTL_TEST_CT  1
+static tTestDesc aAab_Aix_FcntlTests[] = {
+  { TT_EGREP,    zAab_Aix_FcntlSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aab_Aix_Fcntl
+ */
+static const char* apzAab_Aix_FcntlPatch[] = {
+    "wrap",
+    "",
+    "\n\
+#if defined __GNUG__ && defined _LARGE_FILES && defined __cplusplus\n\
+#define __need__aix_fcntl_h_fix\n\
+#ifdef __need__aix_fcntl_h_fix\n\
+#undef open\n\
+#undef creat\n\
+#undef openat\n\
+/* Alias the symbols using asm */\n\
+extern \"C\" {\n\
+extern int open(const char *, int, ...) __asm__(\"open64\");\n\
+extern int creat(const char *, mode_t) __asm__(\"creat64\");\n\
+#if (_XOPEN_SOURCE >= 700)\n\
+extern int openat(int, const char *, int, ...) __asm__(\"open64at\");\n\
+#endif\n\
+}\n\
+#endif\n\
+#endif\n",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aab_Darwin7_9_Long_Double_Funcs fix
@@ -213,44 +267,6 @@ static const char* apzAab_Darwin7_9_Long_Double_FuncsPatch[] = {
 #endif /* __MATH__ */",
     (char*)NULL };
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aab_Darwin7_9_Long_Double_Funcs_2 fix
- */
-tSCC zAab_Darwin7_9_Long_Double_Funcs_2Name[] =
-     "AAB_darwin7_9_long_double_funcs_2";
-
-/*
- *  File name selection pattern
- */
-tSCC zAab_Darwin7_9_Long_Double_Funcs_2List[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAab_Darwin7_9_Long_Double_Funcs_2Machs[] = {
-        "*-*-darwin7.9*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAab_Darwin7_9_Long_Double_Funcs_2Select0[] =
-       "#include[ \\t]+\\\"";
-
-#define    AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_TEST_CT  1
-static tTestDesc aAab_Darwin7_9_Long_Double_Funcs_2Tests[] = {
-  { TT_EGREP,    zAab_Darwin7_9_Long_Double_Funcs_2Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aab_Darwin7_9_Long_Double_Funcs_2
- */
-static const char* apzAab_Darwin7_9_Long_Double_Funcs_2Patch[] = {
-    "format",
-    "%1<%2.h>",
-    "([ \\t]*#[ \\t]*include[ \\t]+)\"([a-z0-9/]+)\\.h\"",
-    (char*)NULL };
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aab_Fd_Zero_Asm_Posix_Types_H fix
@@ -485,1526 +501,2456 @@ static const char* apzAab_Sun_MemcpyPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Complex fix
+ *  Description of Aab_Vxworks_Assert fix
  */
-tSCC zAix_ComplexName[] =
-     "aix_complex";
+tSCC zAab_Vxworks_AssertName[] =
+     "AAB_vxworks_assert";
 
 /*
  *  File name selection pattern
  */
-tSCC zAix_ComplexList[] =
-  "complex.h\0";
+tSCC zAab_Vxworks_AssertList[] =
+  "assert.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAix_ComplexMachs[] = {
-        "*-*-aix*",
+tSCC* apzAab_Vxworks_AssertMachs[] = {
+        "*-*-vxworks*",
         (const char*)NULL };
+#define AAB_VXWORKS_ASSERT_TEST_CT  0
+#define aAab_Vxworks_AssertTests   (tTestDesc*)NULL
 
 /*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAix_ComplexSelect0[] =
-       "#define[ \t]_Complex_I[ \t]__I";
-
-#define    AIX_COMPLEX_TEST_CT  1
-static tTestDesc aAix_ComplexTests[] = {
-  { TT_EGREP,    zAix_ComplexSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aix_Complex
+ *  Fix Command Arguments for Aab_Vxworks_Assert
  */
-static const char* apzAix_ComplexPatch[] = {
-    "format",
-    "#define _Complex_I (__extension__ 1.0iF)",
+static const char* apzAab_Vxworks_AssertPatch[] = {
+"#ifdef _ASSERT_H\n\
+#undef _ASSERT_H\n\
+#undef assert\n\
+#endif\n\n\
+#define _ASSERT_H\n\n\
+#ifdef __cplusplus\n\
+extern \"C\" {\n\
+#endif\n\n\
+#if defined(__STDC__) || defined(__cplusplus)\n\
+extern void __assert (const char*);\n\
+#else\n\
+extern void __assert ();\n\
+#endif\n\n\
+#ifdef NDEBUG\n\
+#define assert(ign) ((void)0)\n\
+#else\n\n\
+#define ASSERT_STRINGIFY(str) ASSERT_STRINGIFY_HELPER(str)\n\
+#define ASSERT_STRINGIFY_HELPER(str) #str\n\n\
+#define assert(test) ((void) \\\n\
+        ((test) ? ((void)0) : \\\n\
+        __assert(\"Assertion failed: \" #test \", file \" \\\n\
+        __FILE__ \", line \" ASSERT_STRINGIFY(__LINE__) \"\\n\")))\n\n\
+#endif\n\n\
+#ifdef __cplusplus\n\
+}\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Pthread fix
+ *  Description of Aab_Vxworks_Regs_Vxtypes fix
  */
-tSCC zAix_PthreadName[] =
-     "aix_pthread";
+tSCC zAab_Vxworks_Regs_VxtypesName[] =
+     "AAB_vxworks_regs_vxtypes";
 
 /*
  *  File name selection pattern
  */
-tSCC zAix_PthreadList[] =
-  "pthread.h\0";
+tSCC zAab_Vxworks_Regs_VxtypesList[] =
+  "regs.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAix_PthreadMachs (const char**)NULL
+tSCC* apzAab_Vxworks_Regs_VxtypesMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
+#define AAB_VXWORKS_REGS_VXTYPES_TEST_CT  0
+#define aAab_Vxworks_Regs_VxtypesTests   (tTestDesc*)NULL
 
 /*
- *  content selection pattern - do fix if pattern found
+ *  Fix Command Arguments for Aab_Vxworks_Regs_Vxtypes
  */
-tSCC zAix_PthreadSelect0[] =
-       "(#define [A-Za-z_0-9]+)(\\\\\n\
-[^A-Za-z_0-9 \t\n\
-(])";
+static const char* apzAab_Vxworks_Regs_VxtypesPatch[] = {
+"#ifndef _REGS_H\n\
+#define _REGS_H\n\
+#include <types/vxTypesOld.h>\n\
+#include_next <arch/../regs.h>\n\
+#endif",
+    (char*)NULL };
 
-#define    AIX_PTHREAD_TEST_CT  1
-static tTestDesc aAix_PthreadTests[] = {
-  { TT_EGREP,    zAix_PthreadSelect0, (regex_t*)NULL }, };
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aab_Vxworks_Unistd fix
+ */
+tSCC zAab_Vxworks_UnistdName[] =
+     "AAB_vxworks_unistd";
 
 /*
- *  Fix Command Arguments for Aix_Pthread
+ *  File name selection pattern
  */
-static const char* apzAix_PthreadPatch[] = {
-    "format",
-    "%1 %2",
+tSCC zAab_Vxworks_UnistdList[] =
+  "unistd.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAab_Vxworks_UnistdMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
+#define AAB_VXWORKS_UNISTD_TEST_CT  0
+#define aAab_Vxworks_UnistdTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Aab_Vxworks_Unistd
+ */
+static const char* apzAab_Vxworks_UnistdPatch[] = {
+"#ifndef _UNISTD_H\n\
+#define _UNISTD_H\n\
+#include_next <unistd.h>\n\
+#include <ioLib.h>\n\
+#ifndef STDIN_FILENO\n\
+#define STDIN_FILENO 0\n\
+#endif\n\
+#ifndef STDOUT_FILENO\n\
+#define STDOUT_FILENO 1\n\
+#endif\n\
+#ifndef STDERR_FILENO\n\
+#define STDERR_FILENO 2\n\
+#endif\n\
+#endif /* _UNISTD_H */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Stdint_1 fix
+ *  Description of Aix_Assert fix
  */
-tSCC zAix_Stdint_1Name[] =
-     "aix_stdint_1";
+tSCC zAix_AssertName[] =
+     "aix_assert";
 
 /*
  *  File name selection pattern
  */
-tSCC zAix_Stdint_1List[] =
-  "stdint-aix.h\0stdint.h\0";
+tSCC zAix_AssertList[] =
+  "assert.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAix_Stdint_1Machs[] = {
+tSCC* apzAix_AssertMachs[] = {
         "*-*-aix*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAix_Stdint_1Select0[] =
-       "#define[ \t]UINT8_MAX[ \t]\\(255U\\)\n\
-#define[ \t]UINT16_MAX[ \t]\\(65535U\\)";
+tSCC zAix_AssertSelect0[] =
+       "#define[ \t]static_assert[ \t]_Static_assert";
 
-#define    AIX_STDINT_1_TEST_CT  1
-static tTestDesc aAix_Stdint_1Tests[] = {
-  { TT_EGREP,    zAix_Stdint_1Select0, (regex_t*)NULL }, };
+#define    AIX_ASSERT_TEST_CT  1
+static tTestDesc aAix_AssertTests[] = {
+  { TT_EGREP,    zAix_AssertSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Aix_Stdint_1
+ *  Fix Command Arguments for Aix_Assert
  */
-static const char* apzAix_Stdint_1Patch[] = {
+static const char* apzAix_AssertPatch[] = {
     "format",
-    "#define UINT8_MAX\t(255)\n\
-#define UINT16_MAX\t(65535)",
+    "#ifndef __cplusplus\n\
+%0\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Stdint_2 fix
+ *  Description of Aix_Complex fix
  */
-tSCC zAix_Stdint_2Name[] =
-     "aix_stdint_2";
+tSCC zAix_ComplexName[] =
+     "aix_complex";
 
 /*
  *  File name selection pattern
  */
-tSCC zAix_Stdint_2List[] =
-  "stdint-aix.h\0stdint.h\0";
+tSCC zAix_ComplexList[] =
+  "complex.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAix_Stdint_2Machs[] = {
+tSCC* apzAix_ComplexMachs[] = {
         "*-*-aix*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAix_Stdint_2Select0[] =
-       "#define[ \t]INTPTR_MIN[ \t]INT64_MIN\n\
-#define[ \t]INTPTR_MAX[ \t]INT64_MAX\n\
-#define[ \t]UINTPTR_MAX[ \t]UINT64_MAX\n\
-#else\n\
-#define[ \t]INTPTR_MIN[ \t]INT32_MIN\n\
-#define[ \t]INTPTR_MAX[ \t]INT32_MAX\n\
-#define[ \t]UINTPTR_MAX[ \t]UINT32_MAX";
+tSCC zAix_ComplexSelect0[] =
+       "#define[ \t]_Complex_I[ \t]__I";
 
-#define    AIX_STDINT_2_TEST_CT  1
-static tTestDesc aAix_Stdint_2Tests[] = {
-  { TT_EGREP,    zAix_Stdint_2Select0, (regex_t*)NULL }, };
+#define    AIX_COMPLEX_TEST_CT  1
+static tTestDesc aAix_ComplexTests[] = {
+  { TT_EGREP,    zAix_ComplexSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Aix_Stdint_2
+ *  Fix Command Arguments for Aix_Complex
  */
-static const char* apzAix_Stdint_2Patch[] = {
+static const char* apzAix_ComplexPatch[] = {
     "format",
-    "#define INTPTR_MIN\t(-INTPTR_MAX-1)\n\
-#define INTPTR_MAX\t9223372036854775807L\n\
-#define UINTPTR_MAX\t18446744073709551615UL\n\
-#else\n\
-#define INTPTR_MIN\t(-INTPTR_MAX-1)\n\
-#define INTPTR_MAX\t2147483647L\n\
-#define UINTPTR_MAX\t4294967295UL",
+    "#define _Complex_I (__extension__ 1.0iF)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Stdint_3 fix
+ *  Description of Aix_Externc fix
  */
-tSCC zAix_Stdint_3Name[] =
-     "aix_stdint_3";
+tSCC zAix_ExterncName[] =
+     "aix_externc";
 
 /*
  *  File name selection pattern
  */
-tSCC zAix_Stdint_3List[] =
-  "stdint-aix.h\0stdint.h\0";
+tSCC zAix_ExterncList[] =
+  "ctype.h\0fcntl.h\0langinfo.h\0ldfcn.h\0sys/localedef.h\0sys/times.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAix_Stdint_3Machs[] = {
+tSCC* apzAix_ExterncMachs[] = {
         "*-*-aix*",
         (const char*)NULL };
 
 /*
- *  content selection pattern - do fix if pattern found
+ *  content bypass pattern - skip fix if pattern found
  */
-tSCC zAix_Stdint_3Select0[] =
-       "#define[ \t]PTRDIFF_MIN[ \t]INT64_MIN\n\
-#define[ \t]PTRDIFF_MAX[ \t]INT64_MAX\n\
-#else\n\
-#define[ \t]PTRDIFF_MIN[ \t]*INT32_MIN\n\
-#define[ \t]PTRDIFF_MAX[ \t]*INT32_MAX";
+tSCC zAix_ExterncBypass0[] =
+       "extern \"C\"";
 
-#define    AIX_STDINT_3_TEST_CT  1
-static tTestDesc aAix_Stdint_3Tests[] = {
-  { TT_EGREP,    zAix_Stdint_3Select0, (regex_t*)NULL }, };
+#define    AIX_EXTERNC_TEST_CT  1
+static tTestDesc aAix_ExterncTests[] = {
+  { TT_NEGREP,   zAix_ExterncBypass0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Aix_Stdint_3
+ *  Fix Command Arguments for Aix_Externc
  */
-static const char* apzAix_Stdint_3Patch[] = {
-    "format",
-    "#define PTRDIFF_MIN\t(-9223372036854775807L - 1)\n\
-#define PTRDIFF_MAX\t9223372036854775807L\n\
-#else\n\
-#define PTRDIFF_MIN\t(-2147483647L - 1)\n\
-#define PTRDIFF_MAX\t2147483647L",
+static const char* apzAix_ExterncPatch[] = {
+    "wrap",
+    "#ifdef __cplusplus\n\
+extern \"C\" {\n\
+#endif\n",
+    "#ifdef __cplusplus\n\
+}\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Stdint_4 fix
+ *  Description of Aix_Externcpp1 fix
  */
-tSCC zAix_Stdint_4Name[] =
-     "aix_stdint_4";
+tSCC zAix_Externcpp1Name[] =
+     "aix_externcpp1";
 
 /*
  *  File name selection pattern
  */
-tSCC zAix_Stdint_4List[] =
-  "stdint-aix.h\0stdint.h\0";
+tSCC zAix_Externcpp1List[] =
+  "sys/socket.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAix_Stdint_4Machs[] = {
+tSCC* apzAix_Externcpp1Machs[] = {
         "*-*-aix*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAix_Stdint_4Select0[] =
-       "#define[ \t]SIZE_MAX[ \t]UINT64_MAX\n\
-#else\n\
-#define[ \t]SIZE_MAX[ \t]*UINT32_MAX";
+tSCC zAix_Externcpp1Select0[] =
+       "#ifdef __cplusplus";
 
-#define    AIX_STDINT_4_TEST_CT  1
-static tTestDesc aAix_Stdint_4Tests[] = {
-  { TT_EGREP,    zAix_Stdint_4Select0, (regex_t*)NULL }, };
+#define    AIX_EXTERNCPP1_TEST_CT  1
+static tTestDesc aAix_Externcpp1Tests[] = {
+  { TT_EGREP,    zAix_Externcpp1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Aix_Stdint_4
+ *  Fix Command Arguments for Aix_Externcpp1
  */
-static const char* apzAix_Stdint_4Patch[] = {
+static const char* apzAix_Externcpp1Patch[] = {
     "format",
-    "#define SIZE_MAX\t18446744073709551615UL\n\
-#else\n\
-#define SIZE_MAX\t4294967295UL",
+    "#ifdef __cplusplus\n\
+extern \"C++\" {",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Stdint_5 fix
+ *  Description of Aix_Externcpp2 fix
  */
-tSCC zAix_Stdint_5Name[] =
-     "aix_stdint_5";
+tSCC zAix_Externcpp2Name[] =
+     "aix_externcpp2";
 
 /*
  *  File name selection pattern
  */
-tSCC zAix_Stdint_5List[] =
-  "stdint-aix.h\0stdint.h\0";
+tSCC zAix_Externcpp2List[] =
+  "sys/socket.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAix_Stdint_5Machs[] = {
+tSCC* apzAix_Externcpp2Machs[] = {
         "*-*-aix*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAix_Stdint_5Select0[] =
-       "#define[ \t]UINT8_C\\(c\\)[ \t]__CONCAT__\\(c,U\\)\n\
-#define[ \t]UINT16_C\\(c\\)[ \t]__CONCAT__\\(c,U\\)";
+tSCC zAix_Externcpp2Select0[] =
+       "#else  /\\* __cplusplus \\*/";
 
-#define    AIX_STDINT_5_TEST_CT  1
-static tTestDesc aAix_Stdint_5Tests[] = {
-  { TT_EGREP,    zAix_Stdint_5Select0, (regex_t*)NULL }, };
+#define    AIX_EXTERNCPP2_TEST_CT  1
+static tTestDesc aAix_Externcpp2Tests[] = {
+  { TT_EGREP,    zAix_Externcpp2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Aix_Stdint_5
+ *  Fix Command Arguments for Aix_Externcpp2
  */
-static const char* apzAix_Stdint_5Patch[] = {
+static const char* apzAix_Externcpp2Patch[] = {
     "format",
-    "#define UINT8_C(c)\tc\n\
-#define UINT16_C(c)\tc",
+    "} /* extern \"C++\" */\n\
+#else  /* __cplusplus */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Sysmachine fix
+ *  Description of Aix_Malloc fix
  */
-tSCC zAix_SysmachineName[] =
-     "aix_sysmachine";
+tSCC zAix_MallocName[] =
+     "aix_malloc";
 
 /*
  *  File name selection pattern
  */
-tSCC zAix_SysmachineList[] =
-  "sys/machine.h\0";
+tSCC zAix_MallocList[] =
+  "malloc.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAix_SysmachineMachs (const char**)NULL
+tSCC* apzAix_MallocMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAix_SysmachineSelect0[] =
-       "\\\\ +\n";
+tSCC zAix_MallocSelect0[] =
+       "#ifdef __cplusplus";
 
-#define    AIX_SYSMACHINE_TEST_CT  1
-static tTestDesc aAix_SysmachineTests[] = {
-  { TT_EGREP,    zAix_SysmachineSelect0, (regex_t*)NULL }, };
+#define    AIX_MALLOC_TEST_CT  1
+static tTestDesc aAix_MallocTests[] = {
+  { TT_EGREP,    zAix_MallocSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Aix_Sysmachine
+ *  Fix Command Arguments for Aix_Malloc
  */
-static const char* apzAix_SysmachinePatch[] = {
+static const char* apzAix_MallocPatch[] = {
     "format",
-    "\\\n",
+    "#if (defined(__cplusplus) && defined(__IBMCPP__))",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Syswait_2 fix
+ *  Description of Aix_Net_If_Arp fix
  */
-tSCC zAix_Syswait_2Name[] =
-     "aix_syswait_2";
+tSCC zAix_Net_If_ArpName[] =
+     "aix_net_if_arp";
 
 /*
  *  File name selection pattern
  */
-tSCC zAix_Syswait_2List[] =
-  "sys/wait.h\0";
+tSCC zAix_Net_If_ArpList[] =
+  "net/if_arp.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAix_Syswait_2Machs (const char**)NULL
+tSCC* apzAix_Net_If_ArpMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAix_Syswait_2Select0[] =
-       "\\? (\\(\\(\\(\\(unsigned[^)]*\\)[^)]*\\) >> [^)]*\\) \\& 0xff\\) : -1)";
+tSCC zAix_Net_If_ArpSelect0[] =
+       "^struct  fc_softc \\{";
 
-#define    AIX_SYSWAIT_2_TEST_CT  1
-static tTestDesc aAix_Syswait_2Tests[] = {
-  { TT_EGREP,    zAix_Syswait_2Select0, (regex_t*)NULL }, };
+#define    AIX_NET_IF_ARP_TEST_CT  1
+static tTestDesc aAix_Net_If_ArpTests[] = {
+  { TT_EGREP,    zAix_Net_If_ArpSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Aix_Syswait_2
+ *  Fix Command Arguments for Aix_Net_If_Arp
  */
-static const char* apzAix_Syswait_2Patch[] = {
+static const char* apzAix_Net_If_ArpPatch[] = {
     "format",
-    "? (int)%1",
+    "typedef struct _fc_softc {",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Volatile fix
+ *  Description of Aix_Null fix
  */
-tSCC zAix_VolatileName[] =
-     "aix_volatile";
+tSCC zAix_NullName[] =
+     "aix_null";
 
 /*
  *  File name selection pattern
  */
-tSCC zAix_VolatileList[] =
-  "sys/signal.h\0";
+tSCC zAix_NullList[] =
+  "curses.h\0dbm.h\0locale.h\0stdio.h\0stdlib.h\0string.h\0time.h\0unistd.h\0wchar.h\0sys/dir.h\0sys/param.h\0sys/types.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAix_VolatileMachs (const char**)NULL
+tSCC* apzAix_NullMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAix_VolatileSelect0[] =
-       "typedef volatile int sig_atomic_t";
+tSCC zAix_NullSelect0[] =
+       "#define[ \t]+NULL[ \t]+\\(*0L*\\)*";
 
-#define    AIX_VOLATILE_TEST_CT  1
-static tTestDesc aAix_VolatileTests[] = {
-  { TT_EGREP,    zAix_VolatileSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zAix_NullBypass0[] =
+       "__null";
+
+#define    AIX_NULL_TEST_CT  2
+static tTestDesc aAix_NullTests[] = {
+  { TT_NEGREP,   zAix_NullBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zAix_NullSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Aix_Volatile
+ *  Fix Command Arguments for Aix_Null
  */
-static const char* apzAix_VolatilePatch[] = {
+static const char* apzAix_NullPatch[] = {
     "format",
-    "typedef int sig_atomic_t",
+    "#ifndef NULL\n\
+#ifdef __cplusplus\n\
+#ifdef __GNUG__\n\
+#define NULL __null\n\
+#else /* ! __GNUG__  */\n\
+#define NULL 0L\n\
+#endif /* __GNUG__  */\n\
+#else /* ! __cplusplus  */\n\
+#define NULL ((void *)0)\n\
+#endif /* __cplusplus  */\n\
+#endif /* !NULL  */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha___Assert fix
+ *  Description of Aix_Once_Init_1 fix
  */
-tSCC zAlpha___AssertName[] =
-     "alpha___assert";
+tSCC zAix_Once_Init_1Name[] =
+     "aix_once_init_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha___AssertList[] =
-  "assert.h\0";
+tSCC zAix_Once_Init_1List[] =
+  "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAlpha___AssertMachs (const char**)NULL
+tSCC* apzAix_Once_Init_1Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha___AssertSelect0[] =
-       "__assert\\(char \\*, char \\*, int\\)";
+tSCC zAix_Once_Init_1Select0[] =
+       "#define[ \t]PTHREAD_ONCE_INIT \\\\\n\
+\\{ \\\\\n";
 
-#define    ALPHA___ASSERT_TEST_CT  1
-static tTestDesc aAlpha___AssertTests[] = {
-  { TT_EGREP,    zAlpha___AssertSelect0, (regex_t*)NULL }, };
+#define    AIX_ONCE_INIT_1_TEST_CT  1
+static tTestDesc aAix_Once_Init_1Tests[] = {
+  { TT_EGREP,    zAix_Once_Init_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha___Assert
+ *  Fix Command Arguments for Aix_Once_Init_1
  */
-static const char* apzAlpha___AssertPatch[] = {
+static const char* apzAix_Once_Init_1Patch[] = {
     "format",
-    "__assert(const char *, const char *, int)",
+    "#define PTHREAD_ONCE_INIT \\\n\
+{{ \\\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha___Extern_Prefix fix
+ *  Description of Aix_Once_Init_2 fix
  */
-tSCC zAlpha___Extern_PrefixName[] =
-     "alpha___extern_prefix";
+tSCC zAix_Once_Init_2Name[] =
+     "aix_once_init_2";
 
 /*
  *  File name selection pattern
  */
-#define zAlpha___Extern_PrefixList (char*)NULL
+tSCC zAix_Once_Init_2List[] =
+  "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAlpha___Extern_PrefixMachs[] = {
-        "alpha*-dec-osf*",
+tSCC* apzAix_Once_Init_2Machs[] = {
+        "*-*-aix*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha___Extern_PrefixSelect0[] =
-       "(.*)(defined\\(__DECC\\)|def[ \t]*__DECC)[ \t]*\n\
-(#[ \t]*pragma[ \t]*extern_prefix.*)";
+tSCC zAix_Once_Init_2Select0[] =
+       "[ \t]0 \\\\\n\
+\\}\n";
 
-#define    ALPHA___EXTERN_PREFIX_TEST_CT  1
-static tTestDesc aAlpha___Extern_PrefixTests[] = {
-  { TT_EGREP,    zAlpha___Extern_PrefixSelect0, (regex_t*)NULL }, };
+#define    AIX_ONCE_INIT_2_TEST_CT  1
+static tTestDesc aAix_Once_Init_2Tests[] = {
+  { TT_EGREP,    zAix_Once_Init_2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha___Extern_Prefix
+ *  Fix Command Arguments for Aix_Once_Init_2
  */
-static const char* apzAlpha___Extern_PrefixPatch[] = {
+static const char* apzAix_Once_Init_2Patch[] = {
     "format",
-    "%1 (defined(__DECC) || defined(__PRAGMA_EXTERN_PREFIX))\n\
-%3",
+    "\t0 \\\n\
+}}\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha___Extern_Prefix_Standards fix
+ *  Description of Aix_Mutex_Initializer_1 fix
  */
-tSCC zAlpha___Extern_Prefix_StandardsName[] =
-     "alpha___extern_prefix_standards";
+tSCC zAix_Mutex_Initializer_1Name[] =
+     "aix_mutex_initializer_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha___Extern_Prefix_StandardsList[] =
-  "standards.h\0";
+tSCC zAix_Mutex_Initializer_1List[] =
+  "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAlpha___Extern_Prefix_StandardsMachs[] = {
-        "alpha*-dec-osf*",
+tSCC* apzAix_Mutex_Initializer_1Machs[] = {
+        "*-*-aix*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha___Extern_Prefix_StandardsSelect0[] =
-       ".*!defined\\(_LIBC_POLLUTION_H_\\) && !defined\\(__DECC\\)";
+tSCC zAix_Mutex_Initializer_1Select0[] =
+       "#define[ \t]PTHREAD_MUTEX_INITIALIZER \\\\\n\
+\\{ \\\\\n";
 
-#define    ALPHA___EXTERN_PREFIX_STANDARDS_TEST_CT  1
-static tTestDesc aAlpha___Extern_Prefix_StandardsTests[] = {
-  { TT_EGREP,    zAlpha___Extern_Prefix_StandardsSelect0, (regex_t*)NULL }, };
+#define    AIX_MUTEX_INITIALIZER_1_TEST_CT  1
+static tTestDesc aAix_Mutex_Initializer_1Tests[] = {
+  { TT_EGREP,    zAix_Mutex_Initializer_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha___Extern_Prefix_Standards
+ *  Fix Command Arguments for Aix_Mutex_Initializer_1
  */
-static const char* apzAlpha___Extern_Prefix_StandardsPatch[] = {
+static const char* apzAix_Mutex_Initializer_1Patch[] = {
     "format",
-    "%0 && !defined(__PRAGMA_EXTERN_PREFIX)",
+    "#define PTHREAD_MUTEX_INITIALIZER \\\n\
+{{ \\\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha___Extern_Prefix_Sys_Stat fix
+ *  Description of Aix_Cond_Initializer_1 fix
  */
-tSCC zAlpha___Extern_Prefix_Sys_StatName[] =
-     "alpha___extern_prefix_sys_stat";
+tSCC zAix_Cond_Initializer_1Name[] =
+     "aix_cond_initializer_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha___Extern_Prefix_Sys_StatList[] =
-  "sys/stat.h\0sys/mount.h\0";
+tSCC zAix_Cond_Initializer_1List[] =
+  "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAlpha___Extern_Prefix_Sys_StatMachs[] = {
-        "alpha*-dec-osf5*",
+tSCC* apzAix_Cond_Initializer_1Machs[] = {
+        "*-*-aix*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha___Extern_Prefix_Sys_StatSelect0[] =
-       "#[ \t]*if[ \t]*defined\\(__DECC\\)";
+tSCC zAix_Cond_Initializer_1Select0[] =
+       "#define[ \t]PTHREAD_COND_INITIALIZER \\\\\n\
+\\{ \\\\\n";
 
-#define    ALPHA___EXTERN_PREFIX_SYS_STAT_TEST_CT  1
-static tTestDesc aAlpha___Extern_Prefix_Sys_StatTests[] = {
-  { TT_EGREP,    zAlpha___Extern_Prefix_Sys_StatSelect0, (regex_t*)NULL }, };
+#define    AIX_COND_INITIALIZER_1_TEST_CT  1
+static tTestDesc aAix_Cond_Initializer_1Tests[] = {
+  { TT_EGREP,    zAix_Cond_Initializer_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha___Extern_Prefix_Sys_Stat
+ *  Fix Command Arguments for Aix_Cond_Initializer_1
  */
-static const char* apzAlpha___Extern_Prefix_Sys_StatPatch[] = {
+static const char* apzAix_Cond_Initializer_1Patch[] = {
     "format",
-    "%0 || defined(__PRAGMA_EXTERN_PREFIX)",
+    "#define PTHREAD_COND_INITIALIZER \\\n\
+{{ \\\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_Assert fix
+ *  Description of Aix_Rwlock_Initializer_1 fix
  */
-tSCC zAlpha_AssertName[] =
-     "alpha_assert";
+tSCC zAix_Rwlock_Initializer_1Name[] =
+     "aix_rwlock_initializer_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha_AssertList[] =
-  "assert.h\0";
+tSCC zAix_Rwlock_Initializer_1List[] =
+  "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAlpha_AssertMachs (const char**)NULL
+tSCC* apzAix_Rwlock_Initializer_1Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha_AssertSelect0[] =
-       "(#[ \t]*define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
+tSCC zAix_Rwlock_Initializer_1Select0[] =
+       "#define[ \t]PTHREAD_RWLOCK_INITIALIZER \\\\\n\
+\\{ \\\\\n";
 
-#define    ALPHA_ASSERT_TEST_CT  1
-static tTestDesc aAlpha_AssertTests[] = {
-  { TT_EGREP,    zAlpha_AssertSelect0, (regex_t*)NULL }, };
+#define    AIX_RWLOCK_INITIALIZER_1_TEST_CT  1
+static tTestDesc aAix_Rwlock_Initializer_1Tests[] = {
+  { TT_EGREP,    zAix_Rwlock_Initializer_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha_Assert
+ *  Fix Command Arguments for Aix_Rwlock_Initializer_1
  */
-static const char* apzAlpha_AssertPatch[] = {
+static const char* apzAix_Rwlock_Initializer_1Patch[] = {
     "format",
-    "%1(EX)",
+    "#define PTHREAD_RWLOCK_INITIALIZER \\\n\
+{{ \\\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_Bad_Lval fix
+ *  Description of Aix_Pthread fix
  */
-tSCC zAlpha_Bad_LvalName[] =
-     "alpha_bad_lval";
+tSCC zAix_PthreadName[] =
+     "aix_pthread";
 
 /*
  *  File name selection pattern
  */
-#define zAlpha_Bad_LvalList (char*)NULL
+tSCC zAix_PthreadList[] =
+  "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAlpha_Bad_LvalMachs[] = {
-        "alpha*-dec-osf*",
-        (const char*)NULL };
+#define apzAix_PthreadMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha_Bad_LvalSelect0[] =
-       "^[ \t]*#[ \t]*pragma[ \t]+extern_prefix";
+tSCC zAix_PthreadSelect0[] =
+       "(#define[\t ][A-Za-z_0-9]+)(\\\\\n\
+[^A-Za-z_0-9 \t\n\
+(])";
 
-#define    ALPHA_BAD_LVAL_TEST_CT  1
-static tTestDesc aAlpha_Bad_LvalTests[] = {
-  { TT_EGREP,    zAlpha_Bad_LvalSelect0, (regex_t*)NULL }, };
+#define    AIX_PTHREAD_TEST_CT  1
+static tTestDesc aAix_PthreadTests[] = {
+  { TT_EGREP,    zAix_PthreadSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha_Bad_Lval
+ *  Fix Command Arguments for Aix_Pthread
  */
-static const char* apzAlpha_Bad_LvalPatch[] = { sed_cmd_z,
-    "-e", "s/^[ \t]*#[ \t]*define[ \t][ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*\\(_.*\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/",
+static const char* apzAix_PthreadPatch[] = {
+    "format",
+    "%1 %2",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_Getopt fix
+ *  Description of Aix_Stdint_1 fix
  */
-tSCC zAlpha_GetoptName[] =
-     "alpha_getopt";
+tSCC zAix_Stdint_1Name[] =
+     "aix_stdint_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha_GetoptList[] =
-  "stdio.h\0stdlib.h\0";
+tSCC zAix_Stdint_1List[] =
+  "stdint-aix.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAlpha_GetoptMachs (const char**)NULL
+tSCC* apzAix_Stdint_1Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha_GetoptSelect0[] =
-       "getopt\\(int, char \\*\\[\\], *char \\*\\)";
+tSCC zAix_Stdint_1Select0[] =
+       "#define[ \t]UINT8_MAX[ \t]\\(255U\\)\n\
+#define[ \t]UINT16_MAX[ \t]\\(65535U\\)";
 
-#define    ALPHA_GETOPT_TEST_CT  1
-static tTestDesc aAlpha_GetoptTests[] = {
-  { TT_EGREP,    zAlpha_GetoptSelect0, (regex_t*)NULL }, };
+#define    AIX_STDINT_1_TEST_CT  1
+static tTestDesc aAix_Stdint_1Tests[] = {
+  { TT_EGREP,    zAix_Stdint_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha_Getopt
+ *  Fix Command Arguments for Aix_Stdint_1
  */
-static const char* apzAlpha_GetoptPatch[] = {
+static const char* apzAix_Stdint_1Patch[] = {
     "format",
-    "getopt(int, char *const[], const char *)",
+    "#define UINT8_MAX\t(255)\n\
+#define UINT16_MAX\t(65535)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_If_Semicolon fix
+ *  Description of Aix_Stdint_2 fix
  */
-tSCC zAlpha_If_SemicolonName[] =
-     "alpha_if_semicolon";
+tSCC zAix_Stdint_2Name[] =
+     "aix_stdint_2";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha_If_SemicolonList[] =
-  "net/if.h\0";
+tSCC zAix_Stdint_2List[] =
+  "stdint-aix.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAlpha_If_SemicolonMachs (const char**)NULL
+tSCC* apzAix_Stdint_2Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha_If_SemicolonSelect0[] =
-       "struct[ \t]+sockaddr[ \t]+vmif_paddr[ \t]+/\\*";
+tSCC zAix_Stdint_2Select0[] =
+       "#define[ \t]INTPTR_MIN[ \t]INT64_MIN\n\
+#define[ \t]INTPTR_MAX[ \t]INT64_MAX\n\
+#define[ \t]UINTPTR_MAX[ \t]UINT64_MAX\n\
+#else\n\
+#define[ \t]INTPTR_MIN[ \t]INT32_MIN\n\
+#define[ \t]INTPTR_MAX[ \t]INT32_MAX\n\
+#define[ \t]UINTPTR_MAX[ \t]UINT32_MAX";
 
-#define    ALPHA_IF_SEMICOLON_TEST_CT  1
-static tTestDesc aAlpha_If_SemicolonTests[] = {
-  { TT_EGREP,    zAlpha_If_SemicolonSelect0, (regex_t*)NULL }, };
+#define    AIX_STDINT_2_TEST_CT  1
+static tTestDesc aAix_Stdint_2Tests[] = {
+  { TT_EGREP,    zAix_Stdint_2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha_If_Semicolon
+ *  Fix Command Arguments for Aix_Stdint_2
  */
-static const char* apzAlpha_If_SemicolonPatch[] = {
+static const char* apzAix_Stdint_2Patch[] = {
     "format",
-    "struct sockaddr vmif_paddr;\t/*",
+    "#define INTPTR_MIN\t(-INTPTR_MAX-1)\n\
+#define INTPTR_MAX\t9223372036854775807L\n\
+#define UINTPTR_MAX\t18446744073709551615UL\n\
+#else\n\
+#define INTPTR_MIN\t(-INTPTR_MAX-1)\n\
+#define INTPTR_MAX\t2147483647L\n\
+#define UINTPTR_MAX\t4294967295UL",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_Parens fix
+ *  Description of Aix_Stdint_3 fix
  */
-tSCC zAlpha_ParensName[] =
-     "alpha_parens";
+tSCC zAix_Stdint_3Name[] =
+     "aix_stdint_3";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha_ParensList[] =
-  "sym.h\0";
+tSCC zAix_Stdint_3List[] =
+  "stdint-aix.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAlpha_ParensMachs (const char**)NULL
+tSCC* apzAix_Stdint_3Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha_ParensSelect0[] =
-       "#ifndef\\(__mips64\\)";
+tSCC zAix_Stdint_3Select0[] =
+       "#define[ \t]PTRDIFF_MIN[ \t]INT64_MIN\n\
+#define[ \t]PTRDIFF_MAX[ \t]INT64_MAX\n\
+#else\n\
+#define[ \t]PTRDIFF_MIN[ \t]*INT32_MIN\n\
+#define[ \t]PTRDIFF_MAX[ \t]*INT32_MAX";
 
-#define    ALPHA_PARENS_TEST_CT  1
-static tTestDesc aAlpha_ParensTests[] = {
-  { TT_EGREP,    zAlpha_ParensSelect0, (regex_t*)NULL }, };
+#define    AIX_STDINT_3_TEST_CT  1
+static tTestDesc aAix_Stdint_3Tests[] = {
+  { TT_EGREP,    zAix_Stdint_3Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha_Parens
+ *  Fix Command Arguments for Aix_Stdint_3
  */
-static const char* apzAlpha_ParensPatch[] = {
+static const char* apzAix_Stdint_3Patch[] = {
     "format",
-    "#ifndef __mips64",
+    "#define PTRDIFF_MIN\t(-9223372036854775807L - 1)\n\
+#define PTRDIFF_MAX\t9223372036854775807L\n\
+#else\n\
+#define PTRDIFF_MIN\t(-2147483647L - 1)\n\
+#define PTRDIFF_MAX\t2147483647L",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_Pthread fix
+ *  Description of Aix_Stdint_4 fix
  */
-tSCC zAlpha_PthreadName[] =
-     "alpha_pthread";
+tSCC zAix_Stdint_4Name[] =
+     "aix_stdint_4";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha_PthreadList[] =
-  "pthread.h\0";
+tSCC zAix_Stdint_4List[] =
+  "stdint-aix.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAlpha_PthreadMachs[] = {
-        "alpha*-dec-osf*",
+tSCC* apzAix_Stdint_4Machs[] = {
+        "*-*-aix*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha_PthreadSelect0[] =
-       "((#[ \t]*if)([ \t]*defined[ \t]*\\(_PTHREAD_ENV_DECC\\)|def _PTHREAD_ENV_DECC)(.*))\n\
-(#[ \t]*define _PTHREAD_USE_PTDNAM_)";
+tSCC zAix_Stdint_4Select0[] =
+       "#define[ \t]SIZE_MAX[ \t]UINT64_MAX\n\
+#else\n\
+#define[ \t]SIZE_MAX[ \t]*UINT32_MAX";
 
-#define    ALPHA_PTHREAD_TEST_CT  1
-static tTestDesc aAlpha_PthreadTests[] = {
-  { TT_EGREP,    zAlpha_PthreadSelect0, (regex_t*)NULL }, };
+#define    AIX_STDINT_4_TEST_CT  1
+static tTestDesc aAix_Stdint_4Tests[] = {
+  { TT_EGREP,    zAix_Stdint_4Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha_Pthread
+ *  Fix Command Arguments for Aix_Stdint_4
  */
-static const char* apzAlpha_PthreadPatch[] = {
+static const char* apzAix_Stdint_4Patch[] = {
     "format",
-    "%2 defined (_PTHREAD_ENV_DECC)%4 || defined (__PRAGMA_EXTERN_PREFIX)\n\
-%5",
+    "#define SIZE_MAX\t18446744073709551615UL\n\
+#else\n\
+#define SIZE_MAX\t4294967295UL",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_Pthread_Gcc fix
+ *  Description of Aix_Stdint_5 fix
  */
-tSCC zAlpha_Pthread_GccName[] =
-     "alpha_pthread_gcc";
+tSCC zAix_Stdint_5Name[] =
+     "aix_stdint_5";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha_Pthread_GccList[] =
-  "pthread.h\0";
+tSCC zAix_Stdint_5List[] =
+  "stdint-aix.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAlpha_Pthread_GccMachs[] = {
-        "alpha*-dec-osf*",
+tSCC* apzAix_Stdint_5Machs[] = {
+        "*-*-aix*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha_Pthread_GccSelect0[] =
-       "#else\n\
-# error <pthread.h>: unrecognized compiler.";
-
-#define    ALPHA_PTHREAD_GCC_TEST_CT  1
-static tTestDesc aAlpha_Pthread_GccTests[] = {
-  { TT_EGREP,    zAlpha_Pthread_GccSelect0, (regex_t*)NULL }, };
+tSCC zAix_Stdint_5Select0[] =
+       "#define[ \t]UINT8_C\\(c\\)[ \t]__CONCAT__\\(c,U\\)\n\
+#define[ \t]UINT16_C\\(c\\)[ \t]__CONCAT__\\(c,U\\)";
+
+#define    AIX_STDINT_5_TEST_CT  1
+static tTestDesc aAix_Stdint_5Tests[] = {
+  { TT_EGREP,    zAix_Stdint_5Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha_Pthread_Gcc
+ *  Fix Command Arguments for Aix_Stdint_5
  */
-static const char* apzAlpha_Pthread_GccPatch[] = {
+static const char* apzAix_Stdint_5Patch[] = {
     "format",
-    "#elif defined (__GNUC__)\n\
-# define _PTHREAD_ENV_GCC\n\
-%0",
+    "#define UINT8_C(c)\tc\n\
+#define UINT16_C(c)\tc",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_Pthread_Init fix
+ *  Description of Aix_Stdio_Inline fix
  */
-tSCC zAlpha_Pthread_InitName[] =
-     "alpha_pthread_init";
+tSCC zAix_Stdio_InlineName[] =
+     "aix_stdio_inline";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha_Pthread_InitList[] =
-  "pthread.h\0";
+tSCC zAix_Stdio_InlineList[] =
+  "stdio.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAlpha_Pthread_InitMachs[] = {
-        "alpha*-dec-osf*",
+tSCC* apzAix_Stdio_InlineMachs[] = {
+        "*-*-aix*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha_Pthread_InitSelect0[] =
-       " \\* @\\(#\\).RCSfile: pthread\\.h,v \\$ .Revision: 1\\.1\\.33\\.21 \\$ \\(DEC\\) .Date: 2000/08/15 15:30:13 \\$";
+tSCC zAix_Stdio_InlineSelect0[] =
+       "#ifdef __cplusplus\\\n\
+}\\\n\
+\\\n\
+#ifdef ferror\\\n";
 
-#define    ALPHA_PTHREAD_INIT_TEST_CT  1
-static tTestDesc aAlpha_Pthread_InitTests[] = {
-  { TT_EGREP,    zAlpha_Pthread_InitSelect0, (regex_t*)NULL }, };
+#define    AIX_STDIO_INLINE_TEST_CT  1
+static tTestDesc aAix_Stdio_InlineTests[] = {
+  { TT_EGREP,    zAix_Stdio_InlineSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha_Pthread_Init
+ *  Fix Command Arguments for Aix_Stdio_Inline
  */
-static const char* apzAlpha_Pthread_InitPatch[] = { sed_cmd_z,
-    "-e", "s@MVALID\\(.*\\)A}@MVALID\\1A, 0, 0, 0, 0, 0, 0 }@\n\
-s@MVALID\\(.*\\)_}@MVALID\\1_, 0, 0, 0, 0 }@\n\
-s@CVALID\\(.*\\)A}@CVALID\\1A, 0, 0, 0, 0 }@\n\
-s@CVALID\\(.*\\)_}@CVALID\\1_, 0, 0 }@\n\
-s@WVALID\\(.*\\)A}@WVALID\\1A, 0, 0, 0, 0, 0, 0, 0, 0, 0 }@\n\
-s@WVALID\\(.*\\)_}@WVALID\\1_, 0, 0, 0, 0, 0, 0, 0 }@\n",
+static const char* apzAix_Stdio_InlinePatch[] = {
+    "format",
+    "#ifdef __cplusplus\n\
+}\n\
+#endif\n\n\
+#if (defined(__cplusplus) && defined(__IBMCPP__))\n\
+#ifdef ferror\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_Sbrk fix
+ *  Description of Aix_Stdlib_Malloc fix
  */
-tSCC zAlpha_SbrkName[] =
-     "alpha_sbrk";
+tSCC zAix_Stdlib_MallocName[] =
+     "aix_stdlib_malloc";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha_SbrkList[] =
-  "unistd.h\0";
+tSCC zAix_Stdlib_MallocList[] =
+  "stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAlpha_SbrkMachs (const char**)NULL
+tSCC* apzAix_Stdlib_MallocMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha_SbrkSelect0[] =
-       "char[ \t]*\\*[\t ]*sbrk[ \t]*\\(";
+tSCC zAix_Stdlib_MallocSelect0[] =
+       "#define[ \t]+malloc[ \t]+__linux_malloc";
 
-#define    ALPHA_SBRK_TEST_CT  1
-static tTestDesc aAlpha_SbrkTests[] = {
-  { TT_EGREP,    zAlpha_SbrkSelect0, (regex_t*)NULL }, };
+#define    AIX_STDLIB_MALLOC_TEST_CT  1
+static tTestDesc aAix_Stdlib_MallocTests[] = {
+  { TT_EGREP,    zAix_Stdlib_MallocSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha_Sbrk
+ *  Fix Command Arguments for Aix_Stdlib_Malloc
  */
-static const char* apzAlpha_SbrkPatch[] = {
+static const char* apzAix_Stdlib_MallocPatch[] = {
     "format",
-    "void *sbrk(",
+    "extern void *malloc(size_t) __asm__(\"__linux_malloc\");",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Avoid_Bool_Define fix
+ *  Description of Aix_Stdlib_Realloc fix
  */
-tSCC zAvoid_Bool_DefineName[] =
-     "avoid_bool_define";
+tSCC zAix_Stdlib_ReallocName[] =
+     "aix_stdlib_realloc";
 
 /*
  *  File name selection pattern
  */
-tSCC zAvoid_Bool_DefineList[] =
-  "curses.h\0curses_colr/curses.h\0term.h\0tinfo.h\0";
+tSCC zAix_Stdlib_ReallocList[] =
+  "stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAvoid_Bool_DefineMachs (const char**)NULL
+tSCC* apzAix_Stdlib_ReallocMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAvoid_Bool_DefineSelect0[] =
-       "#[ \t]*define[ \t]+bool[ \t]";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zAvoid_Bool_DefineBypass0[] =
-       "__cplusplus";
+tSCC zAix_Stdlib_ReallocSelect0[] =
+       "#define[ \t]+realloc[ \t]+__linux_realloc";
 
-#define    AVOID_BOOL_DEFINE_TEST_CT  2
-static tTestDesc aAvoid_Bool_DefineTests[] = {
-  { TT_NEGREP,   zAvoid_Bool_DefineBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zAvoid_Bool_DefineSelect0, (regex_t*)NULL }, };
+#define    AIX_STDLIB_REALLOC_TEST_CT  1
+static tTestDesc aAix_Stdlib_ReallocTests[] = {
+  { TT_EGREP,    zAix_Stdlib_ReallocSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Avoid_Bool_Define
+ *  Fix Command Arguments for Aix_Stdlib_Realloc
  */
-static const char* apzAvoid_Bool_DefinePatch[] = {
+static const char* apzAix_Stdlib_ReallocPatch[] = {
     "format",
-    "#ifndef __cplusplus\n\
-%0\n\
-#endif",
-    "^[ \t]*#[ \t]*define[ \t]+bool[ \t].*",
+    "extern void *realloc(void *, size_t) __asm__(\"__linux_realloc\");",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Avoid_Bool_Type fix
+ *  Description of Aix_Stdlib_Calloc fix
  */
-tSCC zAvoid_Bool_TypeName[] =
-     "avoid_bool_type";
+tSCC zAix_Stdlib_CallocName[] =
+     "aix_stdlib_calloc";
 
 /*
  *  File name selection pattern
  */
-tSCC zAvoid_Bool_TypeList[] =
-  "curses.h\0curses_colr/curses.h\0term.h\0tinfo.h\0";
+tSCC zAix_Stdlib_CallocList[] =
+  "stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAvoid_Bool_TypeMachs (const char**)NULL
+tSCC* apzAix_Stdlib_CallocMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAvoid_Bool_TypeSelect0[] =
-       "^[ \t]*typedef[ \t].*[ \t]bool[ \t]*;";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zAvoid_Bool_TypeBypass0[] =
-       "__cplusplus";
+tSCC zAix_Stdlib_CallocSelect0[] =
+       "#define[ \t]+calloc[ \t]+__linux_calloc";
 
-#define    AVOID_BOOL_TYPE_TEST_CT  2
-static tTestDesc aAvoid_Bool_TypeTests[] = {
-  { TT_NEGREP,   zAvoid_Bool_TypeBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zAvoid_Bool_TypeSelect0, (regex_t*)NULL }, };
+#define    AIX_STDLIB_CALLOC_TEST_CT  1
+static tTestDesc aAix_Stdlib_CallocTests[] = {
+  { TT_EGREP,    zAix_Stdlib_CallocSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Avoid_Bool_Type
+ *  Fix Command Arguments for Aix_Stdlib_Calloc
  */
-static const char* apzAvoid_Bool_TypePatch[] = {
+static const char* apzAix_Stdlib_CallocPatch[] = {
     "format",
-    "#ifndef __cplusplus\n\
-%0\n\
-#endif",
+    "extern void *calloc(size_t, size_t) __asm__(\"__linux_calloc\");",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Avoid_Wchar_T_Type fix
+ *  Description of Aix_Stdlib_Valloc fix
  */
-tSCC zAvoid_Wchar_T_TypeName[] =
-     "avoid_wchar_t_type";
+tSCC zAix_Stdlib_VallocName[] =
+     "aix_stdlib_valloc";
 
 /*
  *  File name selection pattern
  */
-#define zAvoid_Wchar_T_TypeList (char*)NULL
+tSCC zAix_Stdlib_VallocList[] =
+  "stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAvoid_Wchar_T_TypeMachs (const char**)NULL
+tSCC* apzAix_Stdlib_VallocMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAvoid_Wchar_T_TypeSelect0[] =
-       "^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zAvoid_Wchar_T_TypeBypass0[] =
-       "__cplusplus";
-tSCC zAvoid_Wchar_T_TypeBypass1[] =
-       "_LINUX_NLS_H";
-tSCC zAvoid_Wchar_T_TypeBypass2[] =
-       "XFree86: xc/lib/X11/Xlib\\.h";
+tSCC zAix_Stdlib_VallocSelect0[] =
+       "#define[ \t]+valloc[ \t]+__linux_valloc";
 
-#define    AVOID_WCHAR_T_TYPE_TEST_CT  4
-static tTestDesc aAvoid_Wchar_T_TypeTests[] = {
-  { TT_NEGREP,   zAvoid_Wchar_T_TypeBypass0, (regex_t*)NULL },
-  { TT_NEGREP,   zAvoid_Wchar_T_TypeBypass1, (regex_t*)NULL },
-  { TT_NEGREP,   zAvoid_Wchar_T_TypeBypass2, (regex_t*)NULL },
-  { TT_EGREP,    zAvoid_Wchar_T_TypeSelect0, (regex_t*)NULL }, };
+#define    AIX_STDLIB_VALLOC_TEST_CT  1
+static tTestDesc aAix_Stdlib_VallocTests[] = {
+  { TT_EGREP,    zAix_Stdlib_VallocSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Avoid_Wchar_T_Type
+ *  Fix Command Arguments for Aix_Stdlib_Valloc
  */
-static const char* apzAvoid_Wchar_T_TypePatch[] = {
+static const char* apzAix_Stdlib_VallocPatch[] = {
     "format",
-    "#ifndef __cplusplus\n\
-%0\n\
-#endif",
+    "extern void *valloc(size_t) __asm__(\"__linux_valloc\");",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Bad_Struct_Term fix
+ *  Description of Aix_Stdlib_Vec_Malloc fix
  */
-tSCC zBad_Struct_TermName[] =
-     "bad_struct_term";
+tSCC zAix_Stdlib_Vec_MallocName[] =
+     "aix_stdlib_vec_malloc";
 
 /*
  *  File name selection pattern
  */
-tSCC zBad_Struct_TermList[] =
-  "curses.h\0";
+tSCC zAix_Stdlib_Vec_MallocList[] =
+  "stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzBad_Struct_TermMachs (const char**)NULL
+tSCC* apzAix_Stdlib_Vec_MallocMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zBad_Struct_TermSelect0[] =
-       "^[ \t]*typedef[ \t]+struct[ \t]+term[ \t]*;";
+tSCC zAix_Stdlib_Vec_MallocSelect0[] =
+       "#define[ \t]+malloc[ \t]+vec_malloc";
 
-#define    BAD_STRUCT_TERM_TEST_CT  1
-static tTestDesc aBad_Struct_TermTests[] = {
-  { TT_EGREP,    zBad_Struct_TermSelect0, (regex_t*)NULL }, };
+#define    AIX_STDLIB_VEC_MALLOC_TEST_CT  1
+static tTestDesc aAix_Stdlib_Vec_MallocTests[] = {
+  { TT_EGREP,    zAix_Stdlib_Vec_MallocSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Bad_Struct_Term
+ *  Fix Command Arguments for Aix_Stdlib_Vec_Malloc
  */
-static const char* apzBad_Struct_TermPatch[] = {
+static const char* apzAix_Stdlib_Vec_MallocPatch[] = {
     "format",
-    "struct term;",
+    "extern void *malloc(size_t) __asm__(\"vec_malloc\");",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Badquote fix
+ *  Description of Aix_Stdlib_Vec_Calloc fix
  */
-tSCC zBadquoteName[] =
-     "badquote";
+tSCC zAix_Stdlib_Vec_CallocName[] =
+     "aix_stdlib_vec_calloc";
 
 /*
  *  File name selection pattern
  */
-tSCC zBadquoteList[] =
-  "sundev/vuid_event.h\0";
+tSCC zAix_Stdlib_Vec_CallocList[] =
+  "stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzBadquoteMachs (const char**)NULL
+tSCC* apzAix_Stdlib_Vec_CallocMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zBadquoteSelect0[] =
-       "doesn't";
+tSCC zAix_Stdlib_Vec_CallocSelect0[] =
+       "#define[ \t]+calloc[ \t]+vec_calloc";
 
-#define    BADQUOTE_TEST_CT  1
-static tTestDesc aBadquoteTests[] = {
-  { TT_EGREP,    zBadquoteSelect0, (regex_t*)NULL }, };
+#define    AIX_STDLIB_VEC_CALLOC_TEST_CT  1
+static tTestDesc aAix_Stdlib_Vec_CallocTests[] = {
+  { TT_EGREP,    zAix_Stdlib_Vec_CallocSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Badquote
+ *  Fix Command Arguments for Aix_Stdlib_Vec_Calloc
  */
-static const char* apzBadquotePatch[] = {
+static const char* apzAix_Stdlib_Vec_CallocPatch[] = {
     "format",
-    "does not",
+    "extern void *calloc(size_t, size_t) __asm__(\"vec_calloc\");",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Broken_Assert_Stdio fix
+ *  Description of Aix_Strtof_Const fix
  */
-tSCC zBroken_Assert_StdioName[] =
-     "broken_assert_stdio";
+tSCC zAix_Strtof_ConstName[] =
+     "aix_strtof_const";
 
 /*
  *  File name selection pattern
  */
-tSCC zBroken_Assert_StdioList[] =
-  "assert.h\0";
+tSCC zAix_Strtof_ConstList[] =
+  "stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzBroken_Assert_StdioMachs (const char**)NULL
+tSCC* apzAix_Strtof_ConstMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zBroken_Assert_StdioSelect0[] =
-       "stderr";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zBroken_Assert_StdioBypass0[] =
-       "include.*stdio\\.h";
+tSCC zAix_Strtof_ConstSelect0[] =
+       "((extern[ \t]+)?float[ \t]+strtof)\\(char \\*, char \\*\\*\\);";
 
-#define    BROKEN_ASSERT_STDIO_TEST_CT  2
-static tTestDesc aBroken_Assert_StdioTests[] = {
-  { TT_NEGREP,   zBroken_Assert_StdioBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zBroken_Assert_StdioSelect0, (regex_t*)NULL }, };
+#define    AIX_STRTOF_CONST_TEST_CT  1
+static tTestDesc aAix_Strtof_ConstTests[] = {
+  { TT_EGREP,    zAix_Strtof_ConstSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Broken_Assert_Stdio
+ *  Fix Command Arguments for Aix_Strtof_Const
  */
-static const char* apzBroken_Assert_StdioPatch[] = {
-    "wrap",
-    "#include <stdio.h>\n",
+static const char* apzAix_Strtof_ConstPatch[] = {
+    "format",
+    "%1(const char *, char **);",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Broken_Assert_Stdlib fix
+ *  Description of Aix_Sysmachine fix
  */
-tSCC zBroken_Assert_StdlibName[] =
-     "broken_assert_stdlib";
+tSCC zAix_SysmachineName[] =
+     "aix_sysmachine";
 
 /*
  *  File name selection pattern
  */
-tSCC zBroken_Assert_StdlibList[] =
-  "assert.h\0";
+tSCC zAix_SysmachineList[] =
+  "sys/machine.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzBroken_Assert_StdlibMachs (const char**)NULL
+tSCC* apzAix_SysmachineMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zBroken_Assert_StdlibSelect0[] =
-       "exit *\\(|abort *\\(";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zBroken_Assert_StdlibBypass0[] =
-       "include.*stdlib\\.h";
+tSCC zAix_SysmachineSelect0[] =
+       "\\\\ +\n";
 
-#define    BROKEN_ASSERT_STDLIB_TEST_CT  2
-static tTestDesc aBroken_Assert_StdlibTests[] = {
-  { TT_NEGREP,   zBroken_Assert_StdlibBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zBroken_Assert_StdlibSelect0, (regex_t*)NULL }, };
+#define    AIX_SYSMACHINE_TEST_CT  1
+static tTestDesc aAix_SysmachineTests[] = {
+  { TT_EGREP,    zAix_SysmachineSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Broken_Assert_Stdlib
+ *  Fix Command Arguments for Aix_Sysmachine
  */
-static const char* apzBroken_Assert_StdlibPatch[] = {
-    "wrap",
-    "#ifdef __cplusplus\n\
-#include <stdlib.h>\n\
-#endif\n",
+static const char* apzAix_SysmachinePatch[] = {
+    "format",
+    "\\\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Broken_Cabs fix
+ *  Description of Aix_Syswait_2 fix
  */
-tSCC zBroken_CabsName[] =
-     "broken_cabs";
+tSCC zAix_Syswait_2Name[] =
+     "aix_syswait_2";
 
 /*
  *  File name selection pattern
  */
-tSCC zBroken_CabsList[] =
-  "math.h\0architecture/*/math.h\0";
+tSCC zAix_Syswait_2List[] =
+  "sys/wait.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzBroken_CabsMachs (const char**)NULL
+tSCC* apzAix_Syswait_2Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zBroken_CabsSelect0[] =
-       "^extern[ \t]+double[ \t]+cabs";
+tSCC zAix_Syswait_2Select0[] =
+       "\\? (\\(\\(\\(\\(unsigned[^)]*\\)[^)]*\\) >> [^)]*\\) \\& 0xff\\) : -1)";
 
-#define    BROKEN_CABS_TEST_CT  1
-static tTestDesc aBroken_CabsTests[] = {
-  { TT_EGREP,    zBroken_CabsSelect0, (regex_t*)NULL }, };
+#define    AIX_SYSWAIT_2_TEST_CT  1
+static tTestDesc aAix_Syswait_2Tests[] = {
+  { TT_EGREP,    zAix_Syswait_2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Broken_Cabs
+ *  Fix Command Arguments for Aix_Syswait_2
  */
-static const char* apzBroken_CabsPatch[] = { sed_cmd_z,
-    "-e", "s/^extern[ \t]*double[ \t]*cabs[ \t]*([^\\)]*);//",
-    "-e", "s/^extern[ \t]*long[ \t]*double[ \t]*cabsl[ \t]*([^\\)]*);//",
+static const char* apzAix_Syswait_2Patch[] = {
+    "format",
+    "? (int)%1",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Broken_Nan fix
+ *  Description of Aix_Volatile fix
  */
-tSCC zBroken_NanName[] =
-     "broken_nan";
+tSCC zAix_VolatileName[] =
+     "aix_volatile";
 
 /*
  *  File name selection pattern
  */
-tSCC zBroken_NanList[] =
-  "architecture/ppc/math.h\0architecture/*/math.h\0";
+tSCC zAix_VolatileList[] =
+  "sys/signal.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzBroken_NanMachs (const char**)NULL
+tSCC* apzAix_VolatileMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zBroken_NanSelect0[] =
-       "#if defined(__APPLE_CC__) && (__APPLE_CC__ >= 1345)";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zBroken_NanBypass0[] =
-       "powl";
+tSCC zAix_VolatileSelect0[] =
+       "typedef volatile int sig_atomic_t";
 
-#define    BROKEN_NAN_TEST_CT  2
-static tTestDesc aBroken_NanTests[] = {
-  { TT_NEGREP,   zBroken_NanBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zBroken_NanSelect0, (regex_t*)NULL }, };
+#define    AIX_VOLATILE_TEST_CT  1
+static tTestDesc aAix_VolatileTests[] = {
+  { TT_EGREP,    zAix_VolatileSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Broken_Nan
+ *  Fix Command Arguments for Aix_Volatile
  */
-static const char* apzBroken_NanPatch[] = {
+static const char* apzAix_VolatilePatch[] = {
     "format",
-    "#if 1",
+    "typedef int sig_atomic_t",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Bsd_Stdio_Attrs_Conflict fix
+ *  Description of Aix_Unistd fix
  */
-tSCC zBsd_Stdio_Attrs_ConflictName[] =
-     "bsd_stdio_attrs_conflict";
+tSCC zAix_UnistdName[] =
+     "aix_unistd";
 
 /*
  *  File name selection pattern
  */
-tSCC zBsd_Stdio_Attrs_ConflictList[] =
-  "stdio.h\0";
+tSCC zAix_UnistdList[] =
+  "unistd.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzBsd_Stdio_Attrs_ConflictMachs[] = {
-        "*-*-*bsd*",
-        "*-*-*darwin*",
+tSCC* apzAix_UnistdMachs[] = {
+        "*-*-aix*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zBsd_Stdio_Attrs_ConflictSelect0[] =
-       "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$";
+tSCC zAix_UnistdSelect0[] =
+       "[ \t]+static[ \t]+int[ \t]+getdtablesize\\(\\)";
 
-#define    BSD_STDIO_ATTRS_CONFLICT_TEST_CT  1
-static tTestDesc aBsd_Stdio_Attrs_ConflictTests[] = {
-  { TT_EGREP,    zBsd_Stdio_Attrs_ConflictSelect0, (regex_t*)NULL }, };
+#define    AIX_UNISTD_TEST_CT  1
+static tTestDesc aAix_UnistdTests[] = {
+  { TT_EGREP,    zAix_UnistdSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Bsd_Stdio_Attrs_Conflict
+ *  Fix Command Arguments for Aix_Unistd
  */
-static const char* apzBsd_Stdio_Attrs_ConflictPatch[] = {
+static const char* apzAix_UnistdPatch[] = {
     "format",
-    "#define _BSD_STRING(_BSD_X) _BSD_STRINGX(_BSD_X)\n\
-#define _BSD_STRINGX(_BSD_X) #_BSD_X\n\
-int vfscanf(FILE *, const char *, __builtin_va_list) __asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) \"__svfscanf\");",
+    "\tstatic int\t\tgetdtablesize(void)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Ctrl_Quotes_Def fix
+ *  Description of Alpha___Assert fix
  */
-tSCC zCtrl_Quotes_DefName[] =
-     "ctrl_quotes_def";
+tSCC zAlpha___AssertName[] =
+     "alpha___assert";
 
 /*
  *  File name selection pattern
  */
-#define zCtrl_Quotes_DefList (char*)NULL
+tSCC zAlpha___AssertList[] =
+  "assert.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzCtrl_Quotes_DefMachs (const char**)NULL
+#define apzAlpha___AssertMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zCtrl_Quotes_DefSelect0[] =
-       "define[ \t]+[A-Z0-9_]+CTRL\\([a-zA-Z][,)]";
+tSCC zAlpha___AssertSelect0[] =
+       "__assert\\(char \\*, char \\*, int\\)";
 
-#define    CTRL_QUOTES_DEF_TEST_CT  1
-static tTestDesc aCtrl_Quotes_DefTests[] = {
-  { TT_EGREP,    zCtrl_Quotes_DefSelect0, (regex_t*)NULL }, };
+#define    ALPHA___ASSERT_TEST_CT  1
+static tTestDesc aAlpha___AssertTests[] = {
+  { TT_EGREP,    zAlpha___AssertSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Ctrl_Quotes_Def
+ *  Fix Command Arguments for Alpha___Assert
  */
-static const char* apzCtrl_Quotes_DefPatch[] = {
-    "char_macro_def",
-    "CTRL",
+static const char* apzAlpha___AssertPatch[] = {
+    "format",
+    "__assert(const char *, const char *, int)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Ctrl_Quotes_Use fix
+ *  Description of Alpha_Assert fix
  */
-tSCC zCtrl_Quotes_UseName[] =
-     "ctrl_quotes_use";
+tSCC zAlpha_AssertName[] =
+     "alpha_assert";
 
 /*
  *  File name selection pattern
  */
-#define zCtrl_Quotes_UseList (char*)NULL
+tSCC zAlpha_AssertList[] =
+  "assert.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzCtrl_Quotes_UseMachs (const char**)NULL
+#define apzAlpha_AssertMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zCtrl_Quotes_UseSelect0[] =
-       "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+CTRL[ \t]*\\( *[^,']";
+tSCC zAlpha_AssertSelect0[] =
+       "(#[ \t]*define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
 
-#define    CTRL_QUOTES_USE_TEST_CT  1
-static tTestDesc aCtrl_Quotes_UseTests[] = {
-  { TT_EGREP,    zCtrl_Quotes_UseSelect0, (regex_t*)NULL }, };
+#define    ALPHA_ASSERT_TEST_CT  1
+static tTestDesc aAlpha_AssertTests[] = {
+  { TT_EGREP,    zAlpha_AssertSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Ctrl_Quotes_Use
+ *  Fix Command Arguments for Alpha_Assert
  */
-static const char* apzCtrl_Quotes_UsePatch[] = {
-    "char_macro_use",
-    "CTRL",
+static const char* apzAlpha_AssertPatch[] = {
+    "format",
+    "%1(EX)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Cxx_Unready fix
+ *  Description of Alpha_Getopt fix
  */
-tSCC zCxx_UnreadyName[] =
-     "cxx_unready";
+tSCC zAlpha_GetoptName[] =
+     "alpha_getopt";
 
 /*
  *  File name selection pattern
  */
-tSCC zCxx_UnreadyList[] =
-  "sys/mman.h\0rpc/types.h\0";
+tSCC zAlpha_GetoptList[] =
+  "stdio.h\0stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzCxx_UnreadyMachs (const char**)NULL
+#define apzAlpha_GetoptMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zCxx_UnreadySelect0[] =
-       "[^#]+malloc.*;";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zCxx_UnreadyBypass0[] =
-       "\"C\"|__BEGIN_DECLS";
+tSCC zAlpha_GetoptSelect0[] =
+       "getopt\\(int, char \\*\\[\\], *char \\*\\)";
 
-#define    CXX_UNREADY_TEST_CT  2
-static tTestDesc aCxx_UnreadyTests[] = {
-  { TT_NEGREP,   zCxx_UnreadyBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zCxx_UnreadySelect0, (regex_t*)NULL }, };
+#define    ALPHA_GETOPT_TEST_CT  1
+static tTestDesc aAlpha_GetoptTests[] = {
+  { TT_EGREP,    zAlpha_GetoptSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Cxx_Unready
+ *  Fix Command Arguments for Alpha_Getopt
  */
-static const char* apzCxx_UnreadyPatch[] = {
-    "wrap",
-    "#ifdef __cplusplus\n\
-extern \"C\" {\n\
-#endif\n",
-    "#ifdef __cplusplus\n\
-}\n\
-#endif\n",
+static const char* apzAlpha_GetoptPatch[] = {
+    "format",
+    "getopt(int, char *const[], const char *)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Darwin_Externc fix
+ *  Description of Alpha_If_Semicolon fix
  */
-tSCC zDarwin_ExterncName[] =
-     "darwin_externc";
+tSCC zAlpha_If_SemicolonName[] =
+     "alpha_if_semicolon";
 
 /*
  *  File name selection pattern
  */
-tSCC zDarwin_ExterncList[] =
-  "mach-o/swap.h\0mach/mach_time.h\0mach/mach_traps.h\0mach/message.h\0mach/mig.h\0mach/semaphore.h\0";
+tSCC zAlpha_If_SemicolonList[] =
+  "net/if.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzDarwin_ExterncMachs[] = {
-        "*-*-darwin*",
-        (const char*)NULL };
+#define apzAlpha_If_SemicolonMachs (const char**)NULL
 
 /*
- *  content bypass pattern - skip fix if pattern found
+ *  content selection pattern - do fix if pattern found
  */
-tSCC zDarwin_ExterncBypass0[] =
-       "extern \"C\"";
-tSCC zDarwin_ExterncBypass1[] =
-       "__BEGIN_DECLS";
+tSCC zAlpha_If_SemicolonSelect0[] =
+       "struct[ \t]+sockaddr[ \t]+vmif_paddr[ \t]+/\\*";
 
-#define    DARWIN_EXTERNC_TEST_CT  2
-static tTestDesc aDarwin_ExterncTests[] = {
-  { TT_NEGREP,   zDarwin_ExterncBypass0, (regex_t*)NULL },
-  { TT_NEGREP,   zDarwin_ExterncBypass1, (regex_t*)NULL }, };
+#define    ALPHA_IF_SEMICOLON_TEST_CT  1
+static tTestDesc aAlpha_If_SemicolonTests[] = {
+  { TT_EGREP,    zAlpha_If_SemicolonSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Darwin_Externc
+ *  Fix Command Arguments for Alpha_If_Semicolon
  */
-static const char* apzDarwin_ExterncPatch[] = {
-    "wrap",
-    "#ifdef __cplusplus\n\
-extern \"C\" {\n\
-#endif\n",
-    "#ifdef __cplusplus\n\
-}\n\
-#endif\n",
+static const char* apzAlpha_If_SemicolonPatch[] = {
+    "format",
+    "struct sockaddr vmif_paddr;\t/*",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Darwin_Gcc4_Breakage fix
+ *  Description of Alpha_Parens fix
  */
-tSCC zDarwin_Gcc4_BreakageName[] =
-     "darwin_gcc4_breakage";
+tSCC zAlpha_ParensName[] =
+     "alpha_parens";
 
 /*
  *  File name selection pattern
  */
-tSCC zDarwin_Gcc4_BreakageList[] =
-  "AvailabilityMacros.h\0";
+tSCC zAlpha_ParensList[] =
+  "sym.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzDarwin_Gcc4_BreakageMachs[] = {
-        "*-*-darwin*",
-        (const char*)NULL };
+#define apzAlpha_ParensMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zDarwin_Gcc4_BreakageSelect0[] =
-       "\\(__GNUC__ >= 3\\) && \\(__GNUC_MINOR__ >= 1\\)";
+tSCC zAlpha_ParensSelect0[] =
+       "#ifndef\\(__mips64\\)";
 
-#define    DARWIN_GCC4_BREAKAGE_TEST_CT  1
-static tTestDesc aDarwin_Gcc4_BreakageTests[] = {
-  { TT_EGREP,    zDarwin_Gcc4_BreakageSelect0, (regex_t*)NULL }, };
+#define    ALPHA_PARENS_TEST_CT  1
+static tTestDesc aAlpha_ParensTests[] = {
+  { TT_EGREP,    zAlpha_ParensSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Darwin_Gcc4_Breakage
+ *  Fix Command Arguments for Alpha_Parens
  */
-static const char* apzDarwin_Gcc4_BreakagePatch[] = {
+static const char* apzAlpha_ParensPatch[] = {
     "format",
-    "((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))",
+    "#ifndef __mips64",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Darwin_Private_Extern fix
+ *  Description of Alpha_Sbrk fix
  */
-tSCC zDarwin_Private_ExternName[] =
-     "darwin_private_extern";
+tSCC zAlpha_SbrkName[] =
+     "alpha_sbrk";
 
 /*
  *  File name selection pattern
  */
-tSCC zDarwin_Private_ExternList[] =
-  "mach-o/dyld.h\0";
+tSCC zAlpha_SbrkList[] =
+  "unistd.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzDarwin_Private_ExternMachs[] = {
-        "*-*-darwin*",
-        (const char*)NULL };
+#define apzAlpha_SbrkMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zDarwin_Private_ExternSelect0[] =
-       "__private_extern__ [a-z_]+ _dyld_";
+tSCC zAlpha_SbrkSelect0[] =
+       "char[ \t]*\\*[\t ]*sbrk[ \t]*\\(";
 
-#define    DARWIN_PRIVATE_EXTERN_TEST_CT  1
-static tTestDesc aDarwin_Private_ExternTests[] = {
-  { TT_EGREP,    zDarwin_Private_ExternSelect0, (regex_t*)NULL }, };
+#define    ALPHA_SBRK_TEST_CT  1
+static tTestDesc aAlpha_SbrkTests[] = {
+  { TT_EGREP,    zAlpha_SbrkSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Darwin_Private_Extern
+ *  Fix Command Arguments for Alpha_Sbrk
  */
-static const char* apzDarwin_Private_ExternPatch[] = {
+static const char* apzAlpha_SbrkPatch[] = {
     "format",
-    "extern",
-    "__private_extern__",
+    "void *sbrk(",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Darwin_Stdint_1 fix
+ *  Description of Avoid_Bool_Define fix
  */
-tSCC zDarwin_Stdint_1Name[] =
-     "darwin_stdint_1";
-
+tSCC zAvoid_Bool_DefineName[] =
+     "avoid_bool_define";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAvoid_Bool_DefineList[] =
+  "curses.h\0curses_colr/curses.h\0term.h\0tinfo.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAvoid_Bool_DefineMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAvoid_Bool_DefineSelect0[] =
+       "#[ \t]*define[ \t]+bool[ \t]";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zAvoid_Bool_DefineBypass0[] =
+       "__cplusplus";
+
+#define    AVOID_BOOL_DEFINE_TEST_CT  2
+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
+ */
+static const char* apzAvoid_Bool_DefinePatch[] = {
+    "format",
+    "#ifndef __cplusplus\n\
+%0\n\
+#endif",
+    "^[ \t]*#[ \t]*define[ \t]+bool[ \t].*",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Avoid_Bool_Type fix
+ */
+tSCC zAvoid_Bool_TypeName[] =
+     "avoid_bool_type";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAvoid_Bool_TypeList[] =
+  "curses.h\0curses_colr/curses.h\0term.h\0tinfo.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAvoid_Bool_TypeMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAvoid_Bool_TypeSelect0[] =
+       "^[ \t]*typedef[ \t].*[ \t]bool[ \t]*;";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zAvoid_Bool_TypeBypass0[] =
+       "__cplusplus";
+
+#define    AVOID_BOOL_TYPE_TEST_CT  2
+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
+ */
+static const char* apzAvoid_Bool_TypePatch[] = {
+    "format",
+    "#ifndef __cplusplus\n\
+%0\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Avoid_Wchar_T_Type fix
+ */
+tSCC zAvoid_Wchar_T_TypeName[] =
+     "avoid_wchar_t_type";
+
+/*
+ *  File name selection pattern
+ */
+#define zAvoid_Wchar_T_TypeList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAvoid_Wchar_T_TypeMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAvoid_Wchar_T_TypeSelect0[] =
+       "^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zAvoid_Wchar_T_TypeBypass0[] =
+       "__cplusplus";
+tSCC zAvoid_Wchar_T_TypeBypass1[] =
+       "_LINUX_NLS_H";
+tSCC zAvoid_Wchar_T_TypeBypass2[] =
+       "XFree86: xc/lib/X11/Xlib\\.h";
+
+#define    AVOID_WCHAR_T_TYPE_TEST_CT  4
+static tTestDesc aAvoid_Wchar_T_TypeTests[] = {
+  { TT_NEGREP,   zAvoid_Wchar_T_TypeBypass0, (regex_t*)NULL },
+  { TT_NEGREP,   zAvoid_Wchar_T_TypeBypass1, (regex_t*)NULL },
+  { TT_NEGREP,   zAvoid_Wchar_T_TypeBypass2, (regex_t*)NULL },
+  { TT_EGREP,    zAvoid_Wchar_T_TypeSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Avoid_Wchar_T_Type
+ */
+static const char* apzAvoid_Wchar_T_TypePatch[] = {
+    "format",
+    "#ifndef __cplusplus\n\
+%0\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Bad_Struct_Term fix
+ */
+tSCC zBad_Struct_TermName[] =
+     "bad_struct_term";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zBad_Struct_TermList[] =
+  "curses.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzBad_Struct_TermMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zBad_Struct_TermSelect0[] =
+       "^[ \t]*typedef[ \t]+struct[ \t]+term[ \t]*;";
+
+#define    BAD_STRUCT_TERM_TEST_CT  1
+static tTestDesc aBad_Struct_TermTests[] = {
+  { TT_EGREP,    zBad_Struct_TermSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Bad_Struct_Term
+ */
+static const char* apzBad_Struct_TermPatch[] = {
+    "format",
+    "struct term;",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Badquote fix
+ */
+tSCC zBadquoteName[] =
+     "badquote";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zBadquoteList[] =
+  "sundev/vuid_event.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzBadquoteMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zBadquoteSelect0[] =
+       "doesn't";
+
+#define    BADQUOTE_TEST_CT  1
+static tTestDesc aBadquoteTests[] = {
+  { TT_EGREP,    zBadquoteSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Badquote
+ */
+static const char* apzBadquotePatch[] = {
+    "format",
+    "does not",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Broken_Assert_Stdio fix
+ */
+tSCC zBroken_Assert_StdioName[] =
+     "broken_assert_stdio";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zBroken_Assert_StdioList[] =
+  "assert.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzBroken_Assert_StdioMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zBroken_Assert_StdioSelect0[] =
+       "stderr";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zBroken_Assert_StdioBypass0[] =
+       "include.*stdio\\.h";
+
+#define    BROKEN_ASSERT_STDIO_TEST_CT  2
+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
+ */
+static const char* apzBroken_Assert_StdioPatch[] = {
+    "wrap",
+    "#include <stdio.h>\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Broken_Assert_Stdlib fix
+ */
+tSCC zBroken_Assert_StdlibName[] =
+     "broken_assert_stdlib";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zBroken_Assert_StdlibList[] =
+  "assert.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzBroken_Assert_StdlibMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zBroken_Assert_StdlibSelect0[] =
+       "exit *\\(|abort *\\(";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zBroken_Assert_StdlibBypass0[] =
+       "include.*stdlib\\.h";
+
+#define    BROKEN_ASSERT_STDLIB_TEST_CT  2
+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
+ */
+static const char* apzBroken_Assert_StdlibPatch[] = {
+    "wrap",
+    "#ifdef __cplusplus\n\
+#include <stdlib.h>\n\
+#endif\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Broken_Cabs fix
+ */
+tSCC zBroken_CabsName[] =
+     "broken_cabs";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zBroken_CabsList[] =
+  "math.h\0architecture/*/math.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzBroken_CabsMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zBroken_CabsSelect0[] =
+       "^extern[ \t]+double[ \t]+cabs";
+
+#define    BROKEN_CABS_TEST_CT  1
+static tTestDesc aBroken_CabsTests[] = {
+  { TT_EGREP,    zBroken_CabsSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Broken_Cabs
+ */
+static const char* apzBroken_CabsPatch[] = { sed_cmd_z,
+    "-e", "s/^extern[ \t]*double[ \t]*cabs[ \t]*([^\\)]*);//",
+    "-e", "s/^extern[ \t]*long[ \t]*double[ \t]*cabsl[ \t]*([^\\)]*);//",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Broken_Nan fix
+ */
+tSCC zBroken_NanName[] =
+     "broken_nan";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zBroken_NanList[] =
+  "architecture/ppc/math.h\0architecture/*/math.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzBroken_NanMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zBroken_NanSelect0[] =
+       "#if defined\\(__APPLE_CC__\\) && \\(__APPLE_CC__ >= 1345\\)";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zBroken_NanBypass0[] =
+       "powl";
+
+#define    BROKEN_NAN_TEST_CT  2
+static tTestDesc aBroken_NanTests[] = {
+  { TT_NEGREP,   zBroken_NanBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zBroken_NanSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Broken_Nan
+ */
+static const char* apzBroken_NanPatch[] = {
+    "format",
+    "#if 1",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Bsd_Stdio_Attrs_Conflict fix
+ */
+tSCC zBsd_Stdio_Attrs_ConflictName[] =
+     "bsd_stdio_attrs_conflict";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zBsd_Stdio_Attrs_ConflictList[] =
+  "stdio.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzBsd_Stdio_Attrs_ConflictMachs[] = {
+        "*-*-*bsd*",
+        "*-*-*darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zBsd_Stdio_Attrs_ConflictSelect0[] =
+       "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$";
+
+#define    BSD_STDIO_ATTRS_CONFLICT_TEST_CT  1
+static tTestDesc aBsd_Stdio_Attrs_ConflictTests[] = {
+  { TT_EGREP,    zBsd_Stdio_Attrs_ConflictSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Bsd_Stdio_Attrs_Conflict
+ */
+static const char* apzBsd_Stdio_Attrs_ConflictPatch[] = {
+    "format",
+    "#define _BSD_STRING(_BSD_X) _BSD_STRINGX(_BSD_X)\n\
+#define _BSD_STRINGX(_BSD_X) #_BSD_X\n\
+int vfscanf(FILE *, const char *, __builtin_va_list) __asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) \"__svfscanf\");",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Ctrl_Quotes_Def fix
+ */
+tSCC zCtrl_Quotes_DefName[] =
+     "ctrl_quotes_def";
+
+/*
+ *  File name selection pattern
+ */
+#define zCtrl_Quotes_DefList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzCtrl_Quotes_DefMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zCtrl_Quotes_DefSelect0[] =
+       "define[ \t]+[A-Z0-9_]+CTRL\\([a-zA-Z][,)]";
+
+#define    CTRL_QUOTES_DEF_TEST_CT  1
+static tTestDesc aCtrl_Quotes_DefTests[] = {
+  { TT_EGREP,    zCtrl_Quotes_DefSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Ctrl_Quotes_Def
+ */
+static const char* apzCtrl_Quotes_DefPatch[] = {
+    "char_macro_def",
+    "CTRL",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Ctrl_Quotes_Use fix
+ */
+tSCC zCtrl_Quotes_UseName[] =
+     "ctrl_quotes_use";
+
+/*
+ *  File name selection pattern
+ */
+#define zCtrl_Quotes_UseList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzCtrl_Quotes_UseMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zCtrl_Quotes_UseSelect0[] =
+       "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+CTRL[ \t]*\\( *[^,']";
+
+#define    CTRL_QUOTES_USE_TEST_CT  1
+static tTestDesc aCtrl_Quotes_UseTests[] = {
+  { TT_EGREP,    zCtrl_Quotes_UseSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Ctrl_Quotes_Use
+ */
+static const char* apzCtrl_Quotes_UsePatch[] = {
+    "char_macro_use",
+    "CTRL",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Cxx_Unready fix
+ */
+tSCC zCxx_UnreadyName[] =
+     "cxx_unready";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zCxx_UnreadyList[] =
+  "sys/mman.h\0rpc/types.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzCxx_UnreadyMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zCxx_UnreadySelect0[] =
+       "[^#]+malloc.*;";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zCxx_UnreadyBypass0[] =
+       "\"C\"|__BEGIN_DECLS";
+
+#define    CXX_UNREADY_TEST_CT  2
+static tTestDesc aCxx_UnreadyTests[] = {
+  { TT_NEGREP,   zCxx_UnreadyBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zCxx_UnreadySelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Cxx_Unready
+ */
+static const char* apzCxx_UnreadyPatch[] = {
+    "wrap",
+    "#ifdef __cplusplus\n\
+extern \"C\" {\n\
+#endif\n",
+    "#ifdef __cplusplus\n\
+}\n\
+#endif\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Availabilityinternal fix
+ */
+tSCC zDarwin_AvailabilityinternalName[] =
+     "darwin_availabilityinternal";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_AvailabilityinternalList[] =
+  "AvailabilityInternal.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_AvailabilityinternalMachs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_AvailabilityinternalSelect0[] =
+       "#define[ \t]+(__API_[ADU]\\([^)]*\\)).*";
+
+#define    DARWIN_AVAILABILITYINTERNAL_TEST_CT  1
+static tTestDesc aDarwin_AvailabilityinternalTests[] = {
+  { TT_EGREP,    zDarwin_AvailabilityinternalSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Availabilityinternal
+ */
+static const char* apzDarwin_AvailabilityinternalPatch[] = {
+    "format",
+    "#if defined(__has_attribute)\n\
+  #if __has_attribute(availability)\n\
+%0\n\
+  #else\n\
+    #define %1\n\
+  #endif\n\
+#else\n\
+    #define %1\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_9_Long_Double_Funcs_2 fix
+ */
+tSCC zDarwin_9_Long_Double_Funcs_2Name[] =
+     "darwin_9_long_double_funcs_2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_9_Long_Double_Funcs_2List[] =
+  "math.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_9_Long_Double_Funcs_2Machs[] = {
+        "*-*-darwin7.9*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_9_Long_Double_Funcs_2Select0[] =
+       "#include[ \\t]+\\\"";
+
+#define    DARWIN_9_LONG_DOUBLE_FUNCS_2_TEST_CT  1
+static tTestDesc aDarwin_9_Long_Double_Funcs_2Tests[] = {
+  { TT_EGREP,    zDarwin_9_Long_Double_Funcs_2Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_9_Long_Double_Funcs_2
+ */
+static const char* apzDarwin_9_Long_Double_Funcs_2Patch[] = {
+    "format",
+    "%1<%2.h>",
+    "([ \\t]*#[ \\t]*include[ \\t]+)\"([a-z0-9/]+)\\.h\"",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Externc fix
+ */
+tSCC zDarwin_ExterncName[] =
+     "darwin_externc";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_ExterncList[] =
+  "mach-o/swap.h\0mach/mach_time.h\0mach/mach_traps.h\0mach/message.h\0mach/mig.h\0mach/semaphore.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_ExterncMachs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zDarwin_ExterncBypass0[] =
+       "extern \"C\"";
+tSCC zDarwin_ExterncBypass1[] =
+       "__BEGIN_DECLS";
+
+#define    DARWIN_EXTERNC_TEST_CT  2
+static tTestDesc aDarwin_ExterncTests[] = {
+  { TT_NEGREP,   zDarwin_ExterncBypass0, (regex_t*)NULL },
+  { TT_NEGREP,   zDarwin_ExterncBypass1, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Externc
+ */
+static const char* apzDarwin_ExterncPatch[] = {
+    "wrap",
+    "#ifdef __cplusplus\n\
+extern \"C\" {\n\
+#endif\n",
+    "#ifdef __cplusplus\n\
+}\n\
+#endif\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Gcc4_Breakage fix
+ */
+tSCC zDarwin_Gcc4_BreakageName[] =
+     "darwin_gcc4_breakage";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Gcc4_BreakageList[] =
+  "AvailabilityMacros.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Gcc4_BreakageMachs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Gcc4_BreakageSelect0[] =
+       "\\(__GNUC__ >= 3\\) && \\(__GNUC_MINOR__ >= 1\\)";
+
+#define    DARWIN_GCC4_BREAKAGE_TEST_CT  1
+static tTestDesc aDarwin_Gcc4_BreakageTests[] = {
+  { TT_EGREP,    zDarwin_Gcc4_BreakageSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Gcc4_Breakage
+ */
+static const char* apzDarwin_Gcc4_BreakagePatch[] = {
+    "format",
+    "((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Longjmp_Noreturn fix
+ */
+tSCC zDarwin_Longjmp_NoreturnName[] =
+     "darwin_longjmp_noreturn";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Longjmp_NoreturnList[] =
+  "i386/setjmp.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Longjmp_NoreturnMachs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Longjmp_NoreturnSelect0[] =
+       "(.*longjmp\\(.*jmp_buf.*[^)]+\\));";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zDarwin_Longjmp_NoreturnBypass0[] =
+       "__dead2";
+
+#define    DARWIN_LONGJMP_NORETURN_TEST_CT  2
+static tTestDesc aDarwin_Longjmp_NoreturnTests[] = {
+  { TT_NEGREP,   zDarwin_Longjmp_NoreturnBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zDarwin_Longjmp_NoreturnSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Longjmp_Noreturn
+ */
+static const char* apzDarwin_Longjmp_NoreturnPatch[] = {
+    "format",
+    "%1 __attribute__ ((__noreturn__));",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Os_Trace_1 fix
+ */
+tSCC zDarwin_Os_Trace_1Name[] =
+     "darwin_os_trace_1";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Os_Trace_1List[] =
+  "os/trace.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Os_Trace_1Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Os_Trace_1Select0[] =
+       "^(_os_trace_verify_printf.*) (__attribute__.*)";
+
+#define    DARWIN_OS_TRACE_1_TEST_CT  1
+static tTestDesc aDarwin_Os_Trace_1Tests[] = {
+  { TT_EGREP,    zDarwin_Os_Trace_1Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Os_Trace_1
+ */
+static const char* apzDarwin_Os_Trace_1Patch[] = {
+    "format",
+    "%1",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Os_Trace_2 fix
+ */
+tSCC zDarwin_Os_Trace_2Name[] =
+     "darwin_os_trace_2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Os_Trace_2List[] =
+  "os/trace.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Os_Trace_2Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Os_Trace_2Select0[] =
+       "typedef.*\\^os_trace_payload_t.*";
+
+#define    DARWIN_OS_TRACE_2_TEST_CT  1
+static tTestDesc aDarwin_Os_Trace_2Tests[] = {
+  { TT_EGREP,    zDarwin_Os_Trace_2Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Os_Trace_2
+ */
+static const char* apzDarwin_Os_Trace_2Patch[] = {
+    "format",
+    "#if __BLOCKS__\n\
+%0\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Os_Trace_3 fix
+ */
+tSCC zDarwin_Os_Trace_3Name[] =
+     "darwin_os_trace_3";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Os_Trace_3List[] =
+  "os/trace.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Os_Trace_3Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Os_Trace_3Select0[] =
+       "__(API|OSX)_.*\n\
+OS_EXPORT.*\n\
+.*\n\
+_os_trace.*os_trace_payload_t payload);";
+
+#define    DARWIN_OS_TRACE_3_TEST_CT  1
+static tTestDesc aDarwin_Os_Trace_3Tests[] = {
+  { TT_EGREP,    zDarwin_Os_Trace_3Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Os_Trace_3
+ */
+static const char* apzDarwin_Os_Trace_3Patch[] = {
+    "format",
+    "#if __BLOCKS__\n\
+%0\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Private_Extern fix
+ */
+tSCC zDarwin_Private_ExternName[] =
+     "darwin_private_extern";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Private_ExternList[] =
+  "mach-o/dyld.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Private_ExternMachs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Private_ExternSelect0[] =
+       "__private_extern__ [a-z_]+ _dyld_";
+
+#define    DARWIN_PRIVATE_EXTERN_TEST_CT  1
+static tTestDesc aDarwin_Private_ExternTests[] = {
+  { TT_EGREP,    zDarwin_Private_ExternSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Private_Extern
+ */
+static const char* apzDarwin_Private_ExternPatch[] = {
+    "format",
+    "extern",
+    "__private_extern__",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Stdint_1 fix
+ */
+tSCC zDarwin_Stdint_1Name[] =
+     "darwin_stdint_1";
+
 /*
  *  File name selection pattern
  */
@@ -2423,6 +3369,108 @@ static const char* apzEcd_CursorPatch[] = {
     "ecd_cursor",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Feraiseexcept_Nosse_Divbyzero fix
+ */
+tSCC zFeraiseexcept_Nosse_DivbyzeroName[] =
+     "feraiseexcept_nosse_divbyzero";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zFeraiseexcept_Nosse_DivbyzeroList[] =
+  "bits/fenv.h\0*/bits/fenv.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzFeraiseexcept_Nosse_DivbyzeroMachs[] = {
+        "i[34567]86-*-linux*",
+        "x86*-linux*",
+        "amd64-*-linux*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zFeraiseexcept_Nosse_DivbyzeroSelect0[] =
+       "^([\t ]*)__asm__ __volatile__ \\(\"divss %1, %0 *\" : : \"x\" \\(__f\\), \"x\" \\(__g\\)\\);$";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zFeraiseexcept_Nosse_DivbyzeroBypass0[] =
+       "\"fdivp .*; fwait\"";
+
+#define    FERAISEEXCEPT_NOSSE_DIVBYZERO_TEST_CT  2
+static tTestDesc aFeraiseexcept_Nosse_DivbyzeroTests[] = {
+  { TT_NEGREP,   zFeraiseexcept_Nosse_DivbyzeroBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zFeraiseexcept_Nosse_DivbyzeroSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Feraiseexcept_Nosse_Divbyzero
+ */
+static const char* apzFeraiseexcept_Nosse_DivbyzeroPatch[] = {
+    "format",
+    "# ifdef __SSE_MATH__\n\
+%0\n\
+# else\n\
+%1__asm__ __volatile__ (\"fdivp %%%%st, %%%%st(1); fwait\"\n\
+%1\t\t\t: \"=t\" (__f) : \"0\" (__f), \"u\" (__g) : \"st(1)\");\n\
+# endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Feraiseexcept_Nosse_Invalid fix
+ */
+tSCC zFeraiseexcept_Nosse_InvalidName[] =
+     "feraiseexcept_nosse_invalid";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zFeraiseexcept_Nosse_InvalidList[] =
+  "bits/fenv.h\0*/bits/fenv.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzFeraiseexcept_Nosse_InvalidMachs[] = {
+        "i[34567]86-*-linux*",
+        "x86*-linux*",
+        "amd64-*-linux*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zFeraiseexcept_Nosse_InvalidSelect0[] =
+       "^([\t ]*)__asm__ __volatile__ \\(\"divss %0, %0 *\" : : \"x\" \\(__f\\)\\);$";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zFeraiseexcept_Nosse_InvalidBypass0[] =
+       "\"fdiv .*; fwait\"";
+
+#define    FERAISEEXCEPT_NOSSE_INVALID_TEST_CT  2
+static tTestDesc aFeraiseexcept_Nosse_InvalidTests[] = {
+  { TT_NEGREP,   zFeraiseexcept_Nosse_InvalidBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zFeraiseexcept_Nosse_InvalidSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Feraiseexcept_Nosse_Invalid
+ */
+static const char* apzFeraiseexcept_Nosse_InvalidPatch[] = {
+    "format",
+    "# ifdef __SSE_MATH__\n\
+%0\n\
+# else\n\
+%1__asm__ __volatile__ (\"fdiv %%%%st, %%%%st(0); fwait\"\n\
+%1\t\t\t: \"=t\" (__f) : \"0\" (__f));\n\
+# endif",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Freebsd_Gcc3_Breakage fix
@@ -2687,7 +3735,7 @@ tSCC zGlibc_C99_Inline_4Name[] =
  *  File name selection pattern
  */
 tSCC zGlibc_C99_Inline_4List[] =
-  "sys/sysmacros.h\0*/sys/sysmacros.h\0wchar.h\0*/wchar.h\0";
+  "sys/sysmacros.h\0*/sys/sysmacros.h\0wchar.h\0*/wchar.h\0pthread.h\0*/pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2819,7 +3867,7 @@ tSCC zGlibc_StrncpyName[] =
  *  File name selection pattern
  */
 tSCC zGlibc_StrncpyList[] =
-  "bits/string2.h\0";
+  "bits/string2.h\0*/bits/string2.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3294,6 +4342,46 @@ static const char* apzHpux10_Stdio_DeclarationsPatch[] = {
 #  endif /* __STDC__) || __cplusplus */\n",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hppa_Hpux11_Alloca fix
+ */
+tSCC zHppa_Hpux11_AllocaName[] =
+     "hppa_hpux11_alloca";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHppa_Hpux11_AllocaList[] =
+  "alloca.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHppa_Hpux11_AllocaMachs[] = {
+        "hppa*-*-hpux11*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHppa_Hpux11_AllocaSelect0[] =
+       "#ifndef _STDDEF_INCLUDED";
+
+#define    HPPA_HPUX11_ALLOCA_TEST_CT  1
+static tTestDesc aHppa_Hpux11_AllocaTests[] = {
+  { TT_EGREP,    zHppa_Hpux11_AllocaSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hppa_Hpux11_Alloca
+ */
+static const char* apzHppa_Hpux11_AllocaPatch[] = {
+    "format",
+    "#ifndef _SYS_STDSYMS_INCLUDED\n\
+#  include <sys/stdsyms.h>\n\
+#endif /* _SYS_STDSYMS_INCLUDED */\n\n\
+%0",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Hpux11_Abs fix
@@ -3310,7 +4398,7 @@ tSCC zHpux11_AbsList[] =
  *  Machine/OS name selection pattern
  */
 tSCC* apzHpux11_AbsMachs[] = {
-        "ia64-hp-hpux11*",
+        "*-hp-hpux11*",
         (const char*)NULL };
 
 /*
@@ -3328,7 +4416,122 @@ static tTestDesc aHpux11_AbsTests[] = {
  */
 static const char* apzHpux11_AbsPatch[] = {
     "format",
-    "if !defined(_MATH_INCLUDED) || defined(__GNUG__)",
+    "if !defined(_MATH_INCLUDED) || defined(__GNUG__)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux11_Lwp_Rwlock_Valid fix
+ */
+tSCC zHpux11_Lwp_Rwlock_ValidName[] =
+     "hpux11_lwp_rwlock_valid";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_Lwp_Rwlock_ValidList[] =
+  "sys/pthread.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux11_Lwp_Rwlock_ValidMachs[] = {
+        "*-hp-hpux11*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_Lwp_Rwlock_ValidSelect0[] =
+       "#define __LWP_RWLOCK_VALID[ \t]*0x8c91";
+
+#define    HPUX11_LWP_RWLOCK_VALID_TEST_CT  1
+static tTestDesc aHpux11_Lwp_Rwlock_ValidTests[] = {
+  { TT_EGREP,    zHpux11_Lwp_Rwlock_ValidSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Lwp_Rwlock_Valid
+ */
+static const char* apzHpux11_Lwp_Rwlock_ValidPatch[] = {
+    "format",
+    "#define __LWP_RWLOCK_VALID              -29551",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux11_Extern_Sendfile fix
+ */
+tSCC zHpux11_Extern_SendfileName[] =
+     "hpux11_extern_sendfile";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_Extern_SendfileList[] =
+  "sys/socket.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux11_Extern_SendfileMachs[] = {
+        "*-hp-hpux11.[12]*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_Extern_SendfileSelect0[] =
+       "^[ \t]*extern sbsize_t sendfile.*\n\
+.*, int\\)\\);\n";
+
+#define    HPUX11_EXTERN_SENDFILE_TEST_CT  1
+static tTestDesc aHpux11_Extern_SendfileTests[] = {
+  { TT_EGREP,    zHpux11_Extern_SendfileSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Extern_Sendfile
+ */
+static const char* apzHpux11_Extern_SendfilePatch[] = {
+    "format",
+    "#ifndef _APP32_64BIT_OFF_T\n\
+%0#endif\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux11_Extern_Sendpath fix
+ */
+tSCC zHpux11_Extern_SendpathName[] =
+     "hpux11_extern_sendpath";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_Extern_SendpathList[] =
+  "sys/socket.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux11_Extern_SendpathMachs[] = {
+        "*-hp-hpux11.[12]*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_Extern_SendpathSelect0[] =
+       "^[ \t]*extern sbsize_t sendpath.*\n\
+.*, int\\)\\);\n";
+
+#define    HPUX11_EXTERN_SENDPATH_TEST_CT  1
+static tTestDesc aHpux11_Extern_SendpathTests[] = {
+  { TT_EGREP,    zHpux11_Extern_SendpathSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Extern_Sendpath
+ */
+static const char* apzHpux11_Extern_SendpathPatch[] = {
+    "format",
+    "#ifndef _APP32_64BIT_OFF_T\n\
+%0#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3346,7 +4549,9 @@ tSCC zHpux11_FabsfList[] =
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux11_FabsfMachs (const char**)NULL
+tSCC* apzHpux11_FabsfMachs[] = {
+        "*-hp-hpux11*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
@@ -3354,15 +4559,8 @@ tSCC zHpux11_FabsfList[] =
 tSCC zHpux11_FabsfSelect0[] =
        "^[ \t]*#[ \t]*define[ \t]+fabsf\\(.*";
 
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zHpux11_FabsfBypass0[] =
-       "__cplusplus";
-
-#define    HPUX11_FABSF_TEST_CT  2
+#define    HPUX11_FABSF_TEST_CT  1
 static tTestDesc aHpux11_FabsfTests[] = {
-  { TT_NEGREP,   zHpux11_FabsfBypass0, (regex_t*)NULL },
   { TT_EGREP,    zHpux11_FabsfSelect0, (regex_t*)NULL }, };
 
 /*
@@ -3375,6 +4573,43 @@ static const char* apzHpux11_FabsfPatch[] = {
 #endif",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux11_Pthread_Pointer fix
+ */
+tSCC zHpux11_Pthread_PointerName[] =
+     "hpux11_pthread_pointer";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_Pthread_PointerList[] =
+  "sys/pthread.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux11_Pthread_PointerMachs[] = {
+        "*-hp-hpux11.[0-3]*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_Pthread_PointerSelect0[] =
+       "(void[ \t]*\\*)(m|c|rw)(_ptr)";
+
+#define    HPUX11_PTHREAD_POINTER_TEST_CT  1
+static tTestDesc aHpux11_Pthread_PointerTests[] = {
+  { TT_EGREP,    zHpux11_Pthread_PointerSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Pthread_Pointer
+ */
+static const char* apzHpux11_Pthread_PointerPatch[] = {
+    "format",
+    "long\t%2%3",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Hpux11_Pthread_Const fix
@@ -3398,7 +4633,7 @@ tSCC* apzHpux11_Pthread_ConstMachs[] = {
  *  content selection pattern - do fix if pattern found
  */
 tSCC zHpux11_Pthread_ConstSelect0[] =
-       "^#define[ \t]*__POINTER_SET[ \t]*\\(\\(void \\*\\) 1LL\\)";
+       "^(#define[ \t]+__POINTER_SET[ \t0,]*)(.*\\))";
 
 #define    HPUX11_PTHREAD_CONST_TEST_CT  1
 static tTestDesc aHpux11_Pthread_ConstTests[] = {
@@ -3409,7 +4644,7 @@ static tTestDesc aHpux11_Pthread_ConstTests[] = {
  */
 static const char* apzHpux11_Pthread_ConstPatch[] = {
     "format",
-    "#define __POINTER_SET\t\t((void *) 1L)",
+    "%11",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3518,6 +4753,43 @@ static const char* apzHpux11_VsnprintfPatch[] = {
     "%1 __va_list);",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux_Vsscanf fix
+ */
+tSCC zHpux_VsscanfName[] =
+     "hpux_vsscanf";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux_VsscanfList[] =
+  "stdio.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux_VsscanfMachs[] = {
+        "*-*-hpux*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_VsscanfSelect0[] =
+       "(extern int vsscanf\\()char";
+
+#define    HPUX_VSSCANF_TEST_CT  1
+static tTestDesc aHpux_VsscanfTests[] = {
+  { TT_EGREP,    zHpux_VsscanfSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux_Vsscanf
+ */
+static const char* apzHpux_VsscanfPatch[] = {
+    "format",
+    "%1const char",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Hpux8_Bogus_Inlines fix
@@ -3564,355 +4836,372 @@ static const char* apzHpux8_Bogus_InlinesPatch[] = { sed_cmd_z,
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Ctype_Macros fix
+ *  Description of Hpux_C99_Intptr fix
  */
-tSCC zHpux_Ctype_MacrosName[] =
-     "hpux_ctype_macros";
+tSCC zHpux_C99_IntptrName[] =
+     "hpux_c99_intptr";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_Ctype_MacrosList[] =
-  "ctype.h\0";
+tSCC zHpux_C99_IntptrList[] =
+  "stdint-hpux11.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux_Ctype_MacrosMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux_Ctype_MacrosSelect0[] =
-       "((: |\\()__SB_masks \\? )(__SB_masks\\[__(alnum|c)\\] & _IS)";
-
-#define    HPUX_CTYPE_MACROS_TEST_CT  1
-static tTestDesc aHpux_Ctype_MacrosTests[] = {
-  { TT_EGREP,    zHpux_Ctype_MacrosSelect0, (regex_t*)NULL }, };
+tSCC* apzHpux_C99_IntptrMachs[] = {
+        "*-hp-hpux11.3*",
+        (const char*)NULL };
+#define HPUX_C99_INTPTR_TEST_CT  0
+#define aHpux_C99_IntptrTests   (tTestDesc*)NULL
 
 /*
- *  Fix Command Arguments for Hpux_Ctype_Macros
+ *  Fix Command Arguments for Hpux_C99_Intptr
  */
-static const char* apzHpux_Ctype_MacrosPatch[] = {
-    "format",
-    "%1(int)%3",
+static const char* apzHpux_C99_IntptrPatch[] = { sed_cmd_z,
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MAX[ \t]*INT32_MAX[ \t]*$@#define PTRDIFF_MAX (2147483647l)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MIN[ \t]*INT32_MIN[ \t]*$@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MAX[ \t]*INT32_MAX[ \t]*$@#define INTPTR_MAX (2147483647l)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MIN[ \t]*INT32_MIN[ \t]*$@#define INTPTR_MIN (-INTPTR_MAX - 1)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINTPTR_MAX[ \t]*UINT32_MAX[ \t]*$@#define UINTPTR_MAX (4294967295ul)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*SIZE_MAX[ \t]*UINT32_MAX[ \t]*$@#define SIZE_MAX (4294967295ul)@",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Htonl fix
+ *  Description of Hpux_C99_Inttypes fix
  */
-tSCC zHpux_HtonlName[] =
-     "hpux_htonl";
+tSCC zHpux_C99_InttypesName[] =
+     "hpux_c99_inttypes";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_HtonlList[] =
-  "netinet/in.h\0";
+tSCC zHpux_C99_InttypesList[] =
+  "inttypes.h\0stdint-hpux11.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux_HtonlMachs (const char**)NULL
+tSCC* apzHpux_C99_InttypesMachs[] = {
+        "*-hp-hpux11.[23]*",
+        (const char*)NULL };
+#define HPUX_C99_INTTYPES_TEST_CT  0
+#define aHpux_C99_InttypesTests   (tTestDesc*)NULL
 
 /*
- *  content selection pattern - do fix if pattern found
+ *  Fix Command Arguments for Hpux_C99_Inttypes
  */
-tSCC zHpux_HtonlSelect0[] =
-       "#ifndef _XOPEN_SOURCE_EXTENDED[ \t]*\n\
-(/\\*\n\
- \\* Macros for number representation conversion\\.\n\
- \\*/\n\
-#ifndef ntohl)";
+static const char* apzHpux_C99_InttypesPatch[] = { sed_cmd_z,
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT8_C(__c) (__c)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT16_C(__c) (__c)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT32_C(__c)[ \t]*__CONCAT__(__c,l)[ \t]*$@#define INT32_C(__c) (__c)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT32_C(__c)[ \t].*$@#define UINT32_C(__c) __CONCAT__(__c,u)@",
+    (char*)NULL };
 
-#define    HPUX_HTONL_TEST_CT  1
-static tTestDesc aHpux_HtonlTests[] = {
-  { TT_EGREP,    zHpux_HtonlSelect0, (regex_t*)NULL }, };
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux_C99_Inttypes2 fix
+ */
+tSCC zHpux_C99_Inttypes2Name[] =
+     "hpux_c99_inttypes2";
 
 /*
- *  Fix Command Arguments for Hpux_Htonl
+ *  File name selection pattern
  */
-static const char* apzHpux_HtonlPatch[] = {
-    "format",
-    "#if 1\n\
-%1",
+tSCC zHpux_C99_Inttypes2List[] =
+  "stdint-hpux11.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux_C99_Inttypes2Machs[] = {
+        "*-hp-hpux11.2*",
+        (const char*)NULL };
+#define HPUX_C99_INTTYPES2_TEST_CT  0
+#define aHpux_C99_Inttypes2Tests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Hpux_C99_Inttypes2
+ */
+static const char* apzHpux_C99_Inttypes2Patch[] = { sed_cmd_z,
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT8_C(__c)[ \t]*((signed char)(__c))[ \t]*$@#define INT8_C(__c) (__c)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*((unsigned char)(__c))[ \t]*$@#define UINT8_C(__c) (__c)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT16_C(__c)[ \t]*((short)(__c))[ \t]*$@#define INT16_C(__c) (__c)@",
+    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*((unsigned short)(__c))[ \t]*$@#define UINT16_C(__c) (__c)@",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Long_Double fix
+ *  Description of Hpux_Ctype_Macros fix
  */
-tSCC zHpux_Long_DoubleName[] =
-     "hpux_long_double";
+tSCC zHpux_Ctype_MacrosName[] =
+     "hpux_ctype_macros";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_Long_DoubleList[] =
-  "stdlib.h\0";
+tSCC zHpux_Ctype_MacrosList[] =
+  "ctype.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_Long_DoubleMachs[] = {
-        "*-*-hpux10*",
-        "*-*-hpux11.[012]*",
-        (const char*)NULL };
+#define apzHpux_Ctype_MacrosMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_Long_DoubleSelect0[] =
-       "extern[ \t]long_double[ \t]strtold";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zHpux_Long_DoubleBypass0[] =
-       "long_double_t";
+tSCC zHpux_Ctype_MacrosSelect0[] =
+       "((: |\\()__SB_masks \\? )(__SB_masks\\[__(alnum|c)\\] & _IS)";
 
-#define    HPUX_LONG_DOUBLE_TEST_CT  2
-static tTestDesc aHpux_Long_DoubleTests[] = {
-  { TT_NEGREP,   zHpux_Long_DoubleBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zHpux_Long_DoubleSelect0, (regex_t*)NULL }, };
+#define    HPUX_CTYPE_MACROS_TEST_CT  1
+static tTestDesc aHpux_Ctype_MacrosTests[] = {
+  { TT_EGREP,    zHpux_Ctype_MacrosSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_Long_Double
+ *  Fix Command Arguments for Hpux_Ctype_Macros
  */
-static const char* apzHpux_Long_DoublePatch[] = { sed_cmd_z,
-    "-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D",
-    "-e", "s/long_double/long double/g",
+static const char* apzHpux_Ctype_MacrosPatch[] = {
+    "format",
+    "%1(int)%3",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Long_Double_2 fix
+ *  Description of Hpux_Extern_Errno fix
  */
-tSCC zHpux_Long_Double_2Name[] =
-     "hpux_long_double_2";
+tSCC zHpux_Extern_ErrnoName[] =
+     "hpux_extern_errno";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_Long_Double_2List[] =
-  "stdlib.h\0";
+tSCC zHpux_Extern_ErrnoList[] =
+  "errno.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_Long_Double_2Machs[] = {
-        "hppa*-*-hpux11.3*",
+tSCC* apzHpux_Extern_ErrnoMachs[] = {
+        "*-hp-hpux10.*",
+        "*-hp-hpux11.[0-2]*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_Long_Double_2Select0[] =
-       "#[ \t]*if[ \t]*!defined\\(__ia64\\) \\|\\| defined\\(_PROTOTYPES\\) \\|\\| defined\\(_LONG_DOUBLE_STRUCT\\)";
+tSCC zHpux_Extern_ErrnoSelect0[] =
+       "^[ \t]*extern int errno;$";
 
-#define    HPUX_LONG_DOUBLE_2_TEST_CT  1
-static tTestDesc aHpux_Long_Double_2Tests[] = {
-  { TT_EGREP,    zHpux_Long_Double_2Select0, (regex_t*)NULL }, };
+#define    HPUX_EXTERN_ERRNO_TEST_CT  1
+static tTestDesc aHpux_Extern_ErrnoTests[] = {
+  { TT_EGREP,    zHpux_Extern_ErrnoSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_Long_Double_2
+ *  Fix Command Arguments for Hpux_Extern_Errno
  */
-static const char* apzHpux_Long_Double_2Patch[] = {
+static const char* apzHpux_Extern_ErrnoPatch[] = {
     "format",
-    "#  if !defined(_PROTOTYPES) || defined(_LONG_DOUBLE_STRUCT)",
+    "#ifdef __cplusplus\n\
+extern \"C\" {\n\
+#endif\n\
+%0\n\
+#ifdef __cplusplus\n\
+}\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Systime fix
+ *  Description of Hpux_Htonl fix
  */
-tSCC zHpux_SystimeName[] =
-     "hpux_systime";
+tSCC zHpux_HtonlName[] =
+     "hpux_htonl";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_SystimeList[] =
-  "sys/time.h\0";
+tSCC zHpux_HtonlList[] =
+  "netinet/in.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux_SystimeMachs (const char**)NULL
+#define apzHpux_HtonlMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_SystimeSelect0[] =
-       "^extern struct sigevent;";
+tSCC zHpux_HtonlSelect0[] =
+       "#ifndef _XOPEN_SOURCE_EXTENDED[ \t]*\n\
+(/\\*\n\
+ \\* Macros for number representation conversion\\.\n\
+ \\*/\n\
+#ifndef ntohl)";
 
-#define    HPUX_SYSTIME_TEST_CT  1
-static tTestDesc aHpux_SystimeTests[] = {
-  { TT_EGREP,    zHpux_SystimeSelect0, (regex_t*)NULL }, };
+#define    HPUX_HTONL_TEST_CT  1
+static tTestDesc aHpux_HtonlTests[] = {
+  { TT_EGREP,    zHpux_HtonlSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_Systime
+ *  Fix Command Arguments for Hpux_Htonl
  */
-static const char* apzHpux_SystimePatch[] = {
+static const char* apzHpux_HtonlPatch[] = {
     "format",
-    "struct sigevent;",
+    "#if 1\n\
+%1",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Spu_Info fix
+ *  Description of Hpux_Imaginary_I fix
  */
-tSCC zHpux_Spu_InfoName[] =
-     "hpux_spu_info";
+tSCC zHpux_Imaginary_IName[] =
+     "hpux_imaginary_i";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_Spu_InfoList[] =
-  "ia64/sys/getppdp.h\0*/sys/getppdp.h\0";
+tSCC zHpux_Imaginary_IList[] =
+  "complex.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_Spu_InfoMachs[] = {
-        "*-hp-hpux*",
+tSCC* apzHpux_Imaginary_IMachs[] = {
+        "ia64-hp-hpux11.*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_Spu_InfoSelect0[] =
-       "^.*extern.*spu_info.*";
+tSCC zHpux_Imaginary_ISelect0[] =
+       "^[ \t]*#[ \t]*define[ \t]*_Complex_I.*";
 
-#define    HPUX_SPU_INFO_TEST_CT  1
-static tTestDesc aHpux_Spu_InfoTests[] = {
-  { TT_EGREP,    zHpux_Spu_InfoSelect0, (regex_t*)NULL }, };
+#define    HPUX_IMAGINARY_I_TEST_CT  1
+static tTestDesc aHpux_Imaginary_ITests[] = {
+  { TT_EGREP,    zHpux_Imaginary_ISelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_Spu_Info
+ *  Fix Command Arguments for Hpux_Imaginary_I
  */
-static const char* apzHpux_Spu_InfoPatch[] = {
+static const char* apzHpux_Imaginary_IPatch[] = {
     "format",
-    "#ifdef _KERNEL\n\
-%0\n\
-#endif",
+    "#define _Complex_I (__extension__ 1.0iF)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux11_Extern_Sendfile fix
+ *  Description of Hpux_Inttype_Int8_T fix
  */
-tSCC zHpux11_Extern_SendfileName[] =
-     "hpux11_extern_sendfile";
+tSCC zHpux_Inttype_Int8_TName[] =
+     "hpux_inttype_int8_t";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux11_Extern_SendfileList[] =
-  "sys/socket.h\0";
+tSCC zHpux_Inttype_Int8_TList[] =
+  "sys/_inttypes.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux11_Extern_SendfileMachs[] = {
-        "*-hp-hpux11.[12]*",
+tSCC* apzHpux_Inttype_Int8_TMachs[] = {
+        "*-hp-hpux1[01].*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux11_Extern_SendfileSelect0[] =
-       "^[ \t]*extern sbsize_t sendfile.*\n\
-.*, int\\)\\);\n";
+tSCC zHpux_Inttype_Int8_TSelect0[] =
+       "^[ \t]*typedef[ \t]*char[ \t]*int(_least){0,1}8_t.*";
 
-#define    HPUX11_EXTERN_SENDFILE_TEST_CT  1
-static tTestDesc aHpux11_Extern_SendfileTests[] = {
-  { TT_EGREP,    zHpux11_Extern_SendfileSelect0, (regex_t*)NULL }, };
+#define    HPUX_INTTYPE_INT8_T_TEST_CT  1
+static tTestDesc aHpux_Inttype_Int8_TTests[] = {
+  { TT_EGREP,    zHpux_Inttype_Int8_TSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux11_Extern_Sendfile
+ *  Fix Command Arguments for Hpux_Inttype_Int8_T
  */
-static const char* apzHpux11_Extern_SendfilePatch[] = {
+static const char* apzHpux_Inttype_Int8_TPatch[] = {
     "format",
-    "#ifndef _APP32_64BIT_OFF_T\n\
-%0#endif\n",
+    "typedef signed char int%18_t;",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux11_Extern_Sendpath fix
+ *  Description of Hpux_Long_Double fix
  */
-tSCC zHpux11_Extern_SendpathName[] =
-     "hpux11_extern_sendpath";
+tSCC zHpux_Long_DoubleName[] =
+     "hpux_long_double";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux11_Extern_SendpathList[] =
-  "sys/socket.h\0";
+tSCC zHpux_Long_DoubleList[] =
+  "stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux11_Extern_SendpathMachs[] = {
-        "*-hp-hpux11.[12]*",
+tSCC* apzHpux_Long_DoubleMachs[] = {
+        "*-*-hpux10*",
+        "*-*-hpux11.[012]*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux11_Extern_SendpathSelect0[] =
-       "^[ \t]*extern sbsize_t sendpath.*\n\
-.*, int\\)\\);\n";
+tSCC zHpux_Long_DoubleSelect0[] =
+       "extern[ \t]long_double[ \t]strtold";
 
-#define    HPUX11_EXTERN_SENDPATH_TEST_CT  1
-static tTestDesc aHpux11_Extern_SendpathTests[] = {
-  { TT_EGREP,    zHpux11_Extern_SendpathSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zHpux_Long_DoubleBypass0[] =
+       "long_double_t";
+
+#define    HPUX_LONG_DOUBLE_TEST_CT  2
+static tTestDesc aHpux_Long_DoubleTests[] = {
+  { TT_NEGREP,   zHpux_Long_DoubleBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zHpux_Long_DoubleSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux11_Extern_Sendpath
+ *  Fix Command Arguments for Hpux_Long_Double
  */
-static const char* apzHpux11_Extern_SendpathPatch[] = {
-    "format",
-    "#ifndef _APP32_64BIT_OFF_T\n\
-%0#endif\n",
+static const char* apzHpux_Long_DoublePatch[] = { sed_cmd_z,
+    "-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D",
+    "-e", "s/long_double/long double/g",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Extern_Errno fix
+ *  Description of Hpux_Long_Double_2 fix
  */
-tSCC zHpux_Extern_ErrnoName[] =
-     "hpux_extern_errno";
+tSCC zHpux_Long_Double_2Name[] =
+     "hpux_long_double_2";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_Extern_ErrnoList[] =
-  "errno.h\0";
+tSCC zHpux_Long_Double_2List[] =
+  "stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_Extern_ErrnoMachs[] = {
-        "*-hp-hpux10.*",
-        "*-hp-hpux11.[0-2]*",
+tSCC* apzHpux_Long_Double_2Machs[] = {
+        "hppa*-*-hpux11.3*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_Extern_ErrnoSelect0[] =
-       "^[ \t]*extern int errno;$";
+tSCC zHpux_Long_Double_2Select0[] =
+       "#[ \t]*if[ \t]*!defined\\(__ia64\\) \\|\\| defined\\(_PROTOTYPES\\) \\|\\| defined\\(_LONG_DOUBLE_STRUCT\\)";
 
-#define    HPUX_EXTERN_ERRNO_TEST_CT  1
-static tTestDesc aHpux_Extern_ErrnoTests[] = {
-  { TT_EGREP,    zHpux_Extern_ErrnoSelect0, (regex_t*)NULL }, };
+#define    HPUX_LONG_DOUBLE_2_TEST_CT  1
+static tTestDesc aHpux_Long_Double_2Tests[] = {
+  { TT_EGREP,    zHpux_Long_Double_2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_Extern_Errno
+ *  Fix Command Arguments for Hpux_Long_Double_2
  */
-static const char* apzHpux_Extern_ErrnoPatch[] = {
+static const char* apzHpux_Long_Double_2Patch[] = {
     "format",
-    "#ifdef __cplusplus\n\
-extern \"C\" {\n\
-#endif\n\
-%0\n\
-#ifdef __cplusplus\n\
-}\n\
-#endif",
+    "#  if !defined(_PROTOTYPES) || defined(_LONG_DOUBLE_STRUCT)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3957,97 +5246,41 @@ static const char* apzHpux_Pthread_InitializersPatch[] = { sed_cmd_z,
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_C99_Intptr fix
- */
-tSCC zHpux_C99_IntptrName[] =
-     "hpux_c99_intptr";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux_C99_IntptrList[] =
-  "stdint-hpux11.h\0stdint.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux_C99_IntptrMachs[] = {
-        "*-hp-hpux11.3*",
-        (const char*)NULL };
-#define HPUX_C99_INTPTR_TEST_CT  0
-#define aHpux_C99_IntptrTests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Hpux_C99_Intptr
- */
-static const char* apzHpux_C99_IntptrPatch[] = { sed_cmd_z,
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MAX[ \t]*INT32_MAX[ \t]*$@#define PTRDIFF_MAX (2147483647l)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MIN[ \t]*INT32_MIN[ \t]*$@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MAX[ \t]*INT32_MAX[ \t]*$@#define INTPTR_MAX (2147483647l)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MIN[ \t]*INT32_MIN[ \t]*$@#define INTPTR_MIN (-INTPTR_MAX - 1)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINTPTR_MAX[ \t]*UINT32_MAX[ \t]*$@#define UINTPTR_MAX (4294967295ul)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*SIZE_MAX[ \t]*UINT32_MAX[ \t]*$@#define SIZE_MAX (4294967295ul)@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux_C99_Inttypes fix
+ *  Description of Hpux_Spu_Info fix
  */
-tSCC zHpux_C99_InttypesName[] =
-     "hpux_c99_inttypes";
+tSCC zHpux_Spu_InfoName[] =
+     "hpux_spu_info";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_C99_InttypesList[] =
-  "inttypes.h\0stdint-hpux11.h\0stdint.h\0";
+tSCC zHpux_Spu_InfoList[] =
+  "ia64/sys/getppdp.h\0*/sys/getppdp.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_C99_InttypesMachs[] = {
-        "*-hp-hpux11.[23]*",
+tSCC* apzHpux_Spu_InfoMachs[] = {
+        "*-hp-hpux*",
         (const char*)NULL };
-#define HPUX_C99_INTTYPES_TEST_CT  0
-#define aHpux_C99_InttypesTests   (tTestDesc*)NULL
 
 /*
- *  Fix Command Arguments for Hpux_C99_Inttypes
- */
-static const char* apzHpux_C99_InttypesPatch[] = { sed_cmd_z,
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT8_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT16_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT32_C(__c)[ \t]*__CONCAT__(__c,l)[ \t]*$@#define INT32_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT32_C(__c)[ \t].*$@#define UINT32_C(__c) __CONCAT__(__c,u)@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux_C99_Inttypes2 fix
+ *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_C99_Inttypes2Name[] =
-     "hpux_c99_inttypes2";
+tSCC zHpux_Spu_InfoSelect0[] =
+       "^.*extern.*spu_info.*";
 
-/*
- *  File name selection pattern
- */
-tSCC zHpux_C99_Inttypes2List[] =
-  "stdint-hpux11.h\0stdint.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux_C99_Inttypes2Machs[] = {
-        "*-hp-hpux11.2*",
-        (const char*)NULL };
-#define HPUX_C99_INTTYPES2_TEST_CT  0
-#define aHpux_C99_Inttypes2Tests   (tTestDesc*)NULL
+#define    HPUX_SPU_INFO_TEST_CT  1
+static tTestDesc aHpux_Spu_InfoTests[] = {
+  { TT_EGREP,    zHpux_Spu_InfoSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_C99_Inttypes2
+ *  Fix Command Arguments for Hpux_Spu_Info
  */
-static const char* apzHpux_C99_Inttypes2Patch[] = { sed_cmd_z,
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT8_C(__c)[ \t]*((signed char)(__c))[ \t]*$@#define INT8_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*((unsigned char)(__c))[ \t]*$@#define UINT8_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT16_C(__c)[ \t]*((short)(__c))[ \t]*$@#define INT16_C(__c) (__c)@",
-    "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*((unsigned short)(__c))[ \t]*$@#define UINT16_C(__c) (__c)@",
+static const char* apzHpux_Spu_InfoPatch[] = {
+    "format",
+    "#ifdef _KERNEL\n\
+%0\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -4089,76 +5322,74 @@ static const char* apzHpux_Stdint_Least_FastPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Inttype_Int8_T fix
+ *  Description of Hpux_Longjmp fix
  */
-tSCC zHpux_Inttype_Int8_TName[] =
-     "hpux_inttype_int8_t";
+tSCC zHpux_LongjmpName[] =
+     "hpux_longjmp";
 
 /*
  *  File name selection pattern
- */
-tSCC zHpux_Inttype_Int8_TList[] =
-  "sys/_inttypes.h\0";
+ */
+tSCC zHpux_LongjmpList[] =
+  "setjmp.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_Inttype_Int8_TMachs[] = {
-        "*-hp-hpux1[01].*",
+tSCC* apzHpux_LongjmpMachs[] = {
+        "*-hp-hpux*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_Inttype_Int8_TSelect0[] =
-       "^[ \t]*typedef[ \t]*char[ \t]*int(_least){0,1}8_t.*";
+tSCC zHpux_LongjmpSelect0[] =
+       "^[ \t]*extern[ \t]+void[ \t]+.*longjmp[ \t]*(__\\(\\(.*int\\)\\)|\\(.*int\\)|\\(\\))";
 
-#define    HPUX_INTTYPE_INT8_T_TEST_CT  1
-static tTestDesc aHpux_Inttype_Int8_TTests[] = {
-  { TT_EGREP,    zHpux_Inttype_Int8_TSelect0, (regex_t*)NULL }, };
+#define    HPUX_LONGJMP_TEST_CT  1
+static tTestDesc aHpux_LongjmpTests[] = {
+  { TT_EGREP,    zHpux_LongjmpSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_Inttype_Int8_T
+ *  Fix Command Arguments for Hpux_Longjmp
  */
-static const char* apzHpux_Inttype_Int8_TPatch[] = {
+static const char* apzHpux_LongjmpPatch[] = {
     "format",
-    "typedef signed char int%18_t;",
+    "%0 __attribute__ ((__noreturn__))",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Imaginary_I fix
+ *  Description of Hpux_Systime fix
  */
-tSCC zHpux_Imaginary_IName[] =
-     "hpux_imaginary_i";
+tSCC zHpux_SystimeName[] =
+     "hpux_systime";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_Imaginary_IList[] =
-  "complex.h\0";
+tSCC zHpux_SystimeList[] =
+  "sys/time.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_Imaginary_IMachs[] = {
-        "ia64-hp-hpux11.*",
-        (const char*)NULL };
+#define apzHpux_SystimeMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_Imaginary_ISelect0[] =
-       "^[ \t]*#[ \t]*define[ \t]*_Complex_I.*";
+tSCC zHpux_SystimeSelect0[] =
+       "^extern struct sigevent;";
 
-#define    HPUX_IMAGINARY_I_TEST_CT  1
-static tTestDesc aHpux_Imaginary_ITests[] = {
-  { TT_EGREP,    zHpux_Imaginary_ISelect0, (regex_t*)NULL }, };
+#define    HPUX_SYSTIME_TEST_CT  1
+static tTestDesc aHpux_SystimeTests[] = {
+  { TT_EGREP,    zHpux_SystimeSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_Imaginary_I
+ *  Fix Command Arguments for Hpux_Systime
  */
-static const char* apzHpux_Imaginary_IPatch[] = {
+static const char* apzHpux_SystimePatch[] = {
     "format",
-    "#define _Complex_I (__extension__ 1.0iF)",
+    "struct sigevent;",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -4172,7 +5403,7 @@ tSCC zHuge_Val_HexName[] =
  *  File name selection pattern
  */
 tSCC zHuge_Val_HexList[] =
-  "bits/huge_val.h\0";
+  "bits/huge_val.h\0*/bits/huge_val.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -4214,7 +5445,7 @@ tSCC zHuge_Valf_HexName[] =
  *  File name selection pattern
  */
 tSCC zHuge_Valf_HexList[] =
-  "bits/huge_val.h\0";
+  "bits/huge_val.h\0*/bits/huge_val.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -4256,7 +5487,7 @@ tSCC zHuge_Vall_HexName[] =
  *  File name selection pattern
  */
 tSCC zHuge_Vall_HexList[] =
-  "bits/huge_val.h\0";
+  "bits/huge_val.h\0*/bits/huge_val.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -4425,3737 +5656,3954 @@ static tTestDesc aIp_Missing_SemiTests[] = {
   { TT_EGREP,    zIp_Missing_SemiSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Ip_Missing_Semi
+ *  Fix Command Arguments for Ip_Missing_Semi
+ */
+static const char* apzIp_Missing_SemiPatch[] = { sed_cmd_z,
+    "-e", "/^struct/,/^};/s/}$/};/",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Irix_Limits_Const fix
+ */
+tSCC zIrix_Limits_ConstName[] =
+     "irix_limits_const";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_Limits_ConstList[] =
+  "fixinc-test-limits.h\0limits.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIrix_Limits_ConstMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_Limits_ConstSelect0[] =
+       "^extern const ";
+
+#define    IRIX_LIMITS_CONST_TEST_CT  1
+static tTestDesc aIrix_Limits_ConstTests[] = {
+  { TT_EGREP,    zIrix_Limits_ConstSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Irix_Limits_Const
+ */
+static const char* apzIrix_Limits_ConstPatch[] = {
+    "format",
+    "extern __const ",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Irix_Stdio_Va_List fix
+ */
+tSCC zIrix_Stdio_Va_ListName[] =
+     "irix_stdio_va_list";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_Stdio_Va_ListList[] =
+  "stdio.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIrix_Stdio_Va_ListMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_Stdio_Va_ListSelect0[] =
+       "/\\* va_list \\*/ char \\*";
+
+#define    IRIX_STDIO_VA_LIST_TEST_CT  1
+static tTestDesc aIrix_Stdio_Va_ListTests[] = {
+  { TT_EGREP,    zIrix_Stdio_Va_ListSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Irix_Stdio_Va_List
+ */
+static const char* apzIrix_Stdio_Va_ListPatch[] = {
+    "format",
+    "__gnuc_va_list",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Kandr_Concat fix
+ */
+tSCC zKandr_ConcatName[] =
+     "kandr_concat";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zKandr_ConcatList[] =
+  "sparc/asm_linkage.h\0sun*/asm_linkage.h\0arm/as_support.h\0arm/mc_type.h\0arm/xcb.h\0dev/chardefmac.h\0dev/ps_irq.h\0dev/screen.h\0dev/scsi.h\0sys/tty.h\0Xm.acorn/XmP.h\0bsd43/bsd43_.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzKandr_ConcatMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zKandr_ConcatSelect0[] =
+       "/\\*\\*/";
+
+#define    KANDR_CONCAT_TEST_CT  1
+static tTestDesc aKandr_ConcatTests[] = {
+  { TT_EGREP,    zKandr_ConcatSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Kandr_Concat
+ */
+static const char* apzKandr_ConcatPatch[] = {
+    "format",
+    "##",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Linux_Ia64_Ucontext fix
+ */
+tSCC zLinux_Ia64_UcontextName[] =
+     "linux_ia64_ucontext";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zLinux_Ia64_UcontextList[] =
+  "sys/ucontext.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzLinux_Ia64_UcontextMachs[] = {
+        "ia64-*-linux*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zLinux_Ia64_UcontextSelect0[] =
+       "\\(\\(\\(char \\*\\) &\\(\\(struct sigcontext \\*\\) 0\\)->sc_gr\\[0\\]\\) - \\(char \\*\\) 0\\)";
+
+#define    LINUX_IA64_UCONTEXT_TEST_CT  1
+static tTestDesc aLinux_Ia64_UcontextTests[] = {
+  { TT_EGREP,    zLinux_Ia64_UcontextSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Linux_Ia64_Ucontext
+ */
+static const char* apzLinux_Ia64_UcontextPatch[] = {
+    "format",
+    "__builtin_offsetof (struct sigcontext, sc_gr[0])",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Lynxos_No_Warning_In_Sys_Time_H fix
+ */
+tSCC zLynxos_No_Warning_In_Sys_Time_HName[] =
+     "lynxos_no_warning_in_sys_time_h";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zLynxos_No_Warning_In_Sys_Time_HList[] =
+  "sys/time.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzLynxos_No_Warning_In_Sys_Time_HMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zLynxos_No_Warning_In_Sys_Time_HSelect0[] =
+       "#warning[ \t]+Using <time.h> instead of <sys/time.h>";
+
+#define    LYNXOS_NO_WARNING_IN_SYS_TIME_H_TEST_CT  1
+static tTestDesc aLynxos_No_Warning_In_Sys_Time_HTests[] = {
+  { TT_EGREP,    zLynxos_No_Warning_In_Sys_Time_HSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Lynxos_No_Warning_In_Sys_Time_H
+ */
+static const char* apzLynxos_No_Warning_In_Sys_Time_HPatch[] = {
+    "format",
+    "",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Lynxos_Missing_Putenv fix
+ */
+tSCC zLynxos_Missing_PutenvName[] =
+     "lynxos_missing_putenv";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zLynxos_Missing_PutenvList[] =
+  "stdlib.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzLynxos_Missing_PutenvMachs[] = {
+        "*-*-lynxos*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zLynxos_Missing_PutenvSelect0[] =
+       "extern char \\*getenv[ \t]*_AP\\(\\(const char \\*\\)\\);";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zLynxos_Missing_PutenvBypass0[] =
+       "putenv[ \\t]*\\(";
+
+#define    LYNXOS_MISSING_PUTENV_TEST_CT  2
+static tTestDesc aLynxos_Missing_PutenvTests[] = {
+  { TT_NEGREP,   zLynxos_Missing_PutenvBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zLynxos_Missing_PutenvSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Lynxos_Missing_Putenv
  */
-static const char* apzIp_Missing_SemiPatch[] = { sed_cmd_z,
-    "-e", "/^struct/,/^};/s/}$/};/",
+static const char* apzLynxos_Missing_PutenvPatch[] = {
+    "format",
+    "%0\n\
+extern int putenv\t\t\t\t_AP((char *));",
+    "extern char \\*getenv[ \t]*_AP\\(\\(const char \\*\\)\\);",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix___Restrict fix
+ *  Description of Machine_Ansi_H_Va_List fix
  */
-tSCC zIrix___RestrictName[] =
-     "irix___restrict";
+tSCC zMachine_Ansi_H_Va_ListName[] =
+     "machine_ansi_h_va_list";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix___RestrictList[] =
-  "internal/sgimacros.h\0";
+#define zMachine_Ansi_H_Va_ListList (char*)NULL
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix___RestrictMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
+#define apzMachine_Ansi_H_Va_ListMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix___RestrictSelect0[] =
-       "(#ifdef __c99\n\
-)(#[ \t]*define __restrict restrict)";
+tSCC zMachine_Ansi_H_Va_ListSelect0[] =
+       "define[ \t]+_BSD_VA_LIST_[ \t]";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zMachine_Ansi_H_Va_ListBypass0[] =
+       "__builtin_va_list";
 
-#define    IRIX___RESTRICT_TEST_CT  1
-static tTestDesc aIrix___RestrictTests[] = {
-  { TT_EGREP,    zIrix___RestrictSelect0, (regex_t*)NULL }, };
+#define    MACHINE_ANSI_H_VA_LIST_TEST_CT  2
+static tTestDesc aMachine_Ansi_H_Va_ListTests[] = {
+  { TT_NEGREP,   zMachine_Ansi_H_Va_ListBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zMachine_Ansi_H_Va_ListSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix___Restrict
+ *  Fix Command Arguments for Machine_Ansi_H_Va_List
  */
-static const char* apzIrix___RestrictPatch[] = {
+static const char* apzMachine_Ansi_H_Va_ListPatch[] = {
     "format",
-    "%1#  ifndef __cplusplus\n\
-%2\n\
-#  endif",
+    "%1__builtin_va_list",
+    "(define[ \t]+_BSD_VA_LIST_[ \t]+).*",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix___Generic1 fix
+ *  Description of Machine_Name fix
  */
-tSCC zIrix___Generic1Name[] =
-     "irix___generic1";
+tSCC zMachine_NameName[] =
+     "machine_name";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix___Generic1List[] =
-  "internal/math_core.h\0";
+#define zMachine_NameList (char*)NULL
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix___Generic1Machs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
+#define apzMachine_NameMachs (const char**)NULL
 
 /*
- *  content selection pattern - do fix if pattern found
+ *  perform the C function call test
  */
-tSCC zIrix___Generic1Select0[] =
-       "#define ([a-z]+)\\(x\\) *__generic.*";
+tSCC zMachine_NameFTst0[] = "machine_name";
 
-#define    IRIX___GENERIC1_TEST_CT  1
-static tTestDesc aIrix___Generic1Tests[] = {
-  { TT_EGREP,    zIrix___Generic1Select0, (regex_t*)NULL }, };
+#define    MACHINE_NAME_TEST_CT  1
+static tTestDesc aMachine_NameTests[] = {
+  { TT_FUNCTION, zMachine_NameFTst0,   0 /* unused */ }, };
 
 /*
- *  Fix Command Arguments for Irix___Generic1
+ *  Fix Command Arguments for Machine_Name
  */
-static const char* apzIrix___Generic1Patch[] = {
-    "format",
-    "extern int %1(double);\n\
-extern int %1f(float);\n\
-extern int %1l(long double);\n\
-#define %1(x) (sizeof(x) == sizeof(double) ? _%1(x) \\\n\
-               : sizeof(x) == sizeof(float) ? _%1f(x) \\\n\
-               : _%1l(x))\n",
+static const char* apzMachine_NamePatch[] = {
+    "machine_name",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix___Generic2 fix
+ *  Description of Math_Exception fix
  */
-tSCC zIrix___Generic2Name[] =
-     "irix___generic2";
+tSCC zMath_ExceptionName[] =
+     "math_exception";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix___Generic2List[] =
-  "internal/math_core.h\0";
+tSCC zMath_ExceptionList[] =
+  "math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix___Generic2Machs[] = {
-        "mips-sgi-irix6.5",
+tSCC* apzMath_ExceptionMachs[] = {
+        "*-*-solaris2.1[0-9]*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix___Generic2Select0[] =
-       "#define ([a-z]+)\\(x,y\\) *__generic.*";
+tSCC zMath_ExceptionSelect0[] =
+       "struct exception";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zMath_ExceptionBypass0[] =
+       "We have a problem when using C\\+\\+|for C\\+\\+, _[a-z0-9A-Z_]+_exception; for C, exception";
 
-#define    IRIX___GENERIC2_TEST_CT  1
-static tTestDesc aIrix___Generic2Tests[] = {
-  { TT_EGREP,    zIrix___Generic2Select0, (regex_t*)NULL }, };
+#define    MATH_EXCEPTION_TEST_CT  2
+static tTestDesc aMath_ExceptionTests[] = {
+  { TT_NEGREP,   zMath_ExceptionBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zMath_ExceptionSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix___Generic2
+ *  Fix Command Arguments for Math_Exception
  */
-static const char* apzIrix___Generic2Patch[] = {
-    "format",
-    "#define %1(x,y) \\\n\
-  ((sizeof(x)<=4 && sizeof(y)<=4) ? _%1f(x,y) \\\n\
-   : (sizeof(x)<=8 && sizeof(y)<=8) ? _%1(x,y) \\\n\
-   : _%1l(x,y))\n",
+static const char* apzMath_ExceptionPatch[] = {
+    "wrap",
+    "#ifdef __cplusplus\n\
+#define exception __math_exception\n\
+#endif\n",
+    "#ifdef __cplusplus\n\
+#undef exception\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Asm_Apostrophe fix
+ *  Description of Math_Huge_Val_From_Dbl_Max fix
  */
-tSCC zIrix_Asm_ApostropheName[] =
-     "irix_asm_apostrophe";
+tSCC zMath_Huge_Val_From_Dbl_MaxName[] =
+     "math_huge_val_from_dbl_max";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Asm_ApostropheList[] =
-  "sys/asm.h\0";
+tSCC zMath_Huge_Val_From_Dbl_MaxList[] =
+  "math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzIrix_Asm_ApostropheMachs (const char**)NULL
+#define apzMath_Huge_Val_From_Dbl_MaxMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Asm_ApostropheSelect0[] =
-       "^[ \t]*#.*[Ww]e're";
+tSCC zMath_Huge_Val_From_Dbl_MaxSelect0[] =
+       "define[ \t]+HUGE_VAL[ \t]+DBL_MAX";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zMath_Huge_Val_From_Dbl_MaxBypass0[] =
+       "define[ \t]+DBL_MAX";
 
-#define    IRIX_ASM_APOSTROPHE_TEST_CT  1
-static tTestDesc aIrix_Asm_ApostropheTests[] = {
-  { TT_EGREP,    zIrix_Asm_ApostropheSelect0, (regex_t*)NULL }, };
+#define    MATH_HUGE_VAL_FROM_DBL_MAX_TEST_CT  2
+static tTestDesc aMath_Huge_Val_From_Dbl_MaxTests[] = {
+  { TT_NEGREP,   zMath_Huge_Val_From_Dbl_MaxBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zMath_Huge_Val_From_Dbl_MaxSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Asm_Apostrophe
+ *  Fix Command Arguments for Math_Huge_Val_From_Dbl_Max
  */
-static const char* apzIrix_Asm_ApostrophePatch[] = {
-    "format",
-    "%1 are",
-    "^([ \t]*#.*[Ww]e)'re",
+static const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c",
+    "\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h | sed 's/.*DBL_MAX[ \t]*//' 2>/dev/null`\n\n\
+\tif ( test -n \"${dbl_max_def}\" ) > /dev/null 2>&1\n\
+\tthen sed -e '/define[ \t]*HUGE_VAL[ \t]*DBL_MAX/s@DBL_MAX@'\"$dbl_max_def@\"\n\
+\telse cat\n\
+\tfi",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Complex fix
+ *  Description of Nested_Auth_Des fix
  */
-tSCC zIrix_ComplexName[] =
-     "irix_complex";
+tSCC zNested_Auth_DesName[] =
+     "nested_auth_des";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_ComplexList[] =
-  "complex.h\0";
+tSCC zNested_Auth_DesList[] =
+  "rpc/rpc.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix_ComplexMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
+#define apzNested_Auth_DesMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_ComplexSelect0[] =
-       "#define[ \t]_Complex_I[ \t]\\(\\(float[ \t]_Complex\\)[ \t]\\(__I__\\)\\)";
+tSCC zNested_Auth_DesSelect0[] =
+       "(/\\*.*rpc/auth_des\\.h>.*)/\\*";
 
-#define    IRIX_COMPLEX_TEST_CT  1
-static tTestDesc aIrix_ComplexTests[] = {
-  { TT_EGREP,    zIrix_ComplexSelect0, (regex_t*)NULL }, };
+#define    NESTED_AUTH_DES_TEST_CT  1
+static tTestDesc aNested_Auth_DesTests[] = {
+  { TT_EGREP,    zNested_Auth_DesSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Complex
+ *  Fix Command Arguments for Nested_Auth_Des
  */
-static const char* apzIrix_ComplexPatch[] = { sed_cmd_z,
-    "-e", "s/#define[ \t]_Complex_I[ \t]((float[ \t]_Complex)[ \t](__I__))/#define _Complex_I (__extension__ 1.0iF)/",
-    "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d",
-    "-e", "/#define[ \t]_Imaginary_I/d",
-    "-e", "s/#define[ \t]I[ \t]_Imaginary_I/#define I _Complex_I/",
+static const char* apzNested_Auth_DesPatch[] = {
+    "format",
+    "%1*/ /*",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Limits_Const fix
+ *  Description of Netbsd_C99_Inline_1 fix
  */
-tSCC zIrix_Limits_ConstName[] =
-     "irix_limits_const";
+tSCC zNetbsd_C99_Inline_1Name[] =
+     "netbsd_c99_inline_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Limits_ConstList[] =
-  "fixinc-test-limits.h\0limits.h\0";
+tSCC zNetbsd_C99_Inline_1List[] =
+  "signal.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzIrix_Limits_ConstMachs (const char**)NULL
+tSCC* apzNetbsd_C99_Inline_1Machs[] = {
+        "*-*-netbsd*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Limits_ConstSelect0[] =
-       "^extern const ";
+tSCC zNetbsd_C99_Inline_1Select0[] =
+       "extern __inline int";
 
-#define    IRIX_LIMITS_CONST_TEST_CT  1
-static tTestDesc aIrix_Limits_ConstTests[] = {
-  { TT_EGREP,    zIrix_Limits_ConstSelect0, (regex_t*)NULL }, };
+#define    NETBSD_C99_INLINE_1_TEST_CT  1
+static tTestDesc aNetbsd_C99_Inline_1Tests[] = {
+  { TT_EGREP,    zNetbsd_C99_Inline_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Limits_Const
+ *  Fix Command Arguments for Netbsd_C99_Inline_1
  */
-static const char* apzIrix_Limits_ConstPatch[] = {
+static const char* apzNetbsd_C99_Inline_1Patch[] = {
     "format",
-    "extern __const ",
+    "extern\n\
+#ifdef __GNUC_STDC_INLINE__\n\
+__attribute__((__gnu_inline__))\n\
+#endif\n\
+__inline int",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Pthread_Init fix
+ *  Description of Netbsd_C99_Inline_2 fix
  */
-tSCC zIrix_Pthread_InitName[] =
-     "irix_pthread_init";
+tSCC zNetbsd_C99_Inline_2Name[] =
+     "netbsd_c99_inline_2";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Pthread_InitList[] =
-  "pthread.h\0";
+tSCC zNetbsd_C99_Inline_2List[] =
+  "signal.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix_Pthread_InitMachs[] = {
-        "mips-sgi-irix6.5",
+tSCC* apzNetbsd_C99_Inline_2Machs[] = {
+        "*-*-netbsd*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Pthread_InitSelect0[] =
-       "^(#define[ \t]+PTHREAD_.*_INITIALIZER[ \t]+)(\\{ 0 \\})";
+tSCC zNetbsd_C99_Inline_2Select0[] =
+       "#define _SIGINLINE extern __inline";
 
-#define    IRIX_PTHREAD_INIT_TEST_CT  1
-static tTestDesc aIrix_Pthread_InitTests[] = {
-  { TT_EGREP,    zIrix_Pthread_InitSelect0, (regex_t*)NULL }, };
+#define    NETBSD_C99_INLINE_2_TEST_CT  1
+static tTestDesc aNetbsd_C99_Inline_2Tests[] = {
+  { TT_EGREP,    zNetbsd_C99_Inline_2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Pthread_Init
+ *  Fix Command Arguments for Netbsd_C99_Inline_2
  */
-static const char* apzIrix_Pthread_InitPatch[] = {
+static const char* apzNetbsd_C99_Inline_2Patch[] = {
     "format",
-    "%1{ %2 }",
+    "#ifdef __GNUC_STDC_INLINE__\n\
+#define _SIGINLINE extern __attribute__((__gnu_inline__)) __inline\n\
+#else\n\
+%0\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Socklen_T fix
+ *  Description of Netbsd_Extra_Semicolon fix
  */
-tSCC zIrix_Socklen_TName[] =
-     "irix_socklen_t";
+tSCC zNetbsd_Extra_SemicolonName[] =
+     "netbsd_extra_semicolon";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Socklen_TList[] =
-  "sys/socket.h\0";
+tSCC zNetbsd_Extra_SemicolonList[] =
+  "sys/cdefs.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix_Socklen_TMachs[] = {
-        "mips-sgi-irix6.5",
+tSCC* apzNetbsd_Extra_SemicolonMachs[] = {
+        "*-*-netbsd*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Socklen_TSelect0[] =
-       "(#define _SOCKLEN_T\n\
-)(typedef u_int32_t socklen_t;)";
+tSCC zNetbsd_Extra_SemicolonSelect0[] =
+       "#define[ \t]*__END_DECLS[ \t]*};";
 
-#define    IRIX_SOCKLEN_T_TEST_CT  1
-static tTestDesc aIrix_Socklen_TTests[] = {
-  { TT_EGREP,    zIrix_Socklen_TSelect0, (regex_t*)NULL }, };
+#define    NETBSD_EXTRA_SEMICOLON_TEST_CT  1
+static tTestDesc aNetbsd_Extra_SemicolonTests[] = {
+  { TT_EGREP,    zNetbsd_Extra_SemicolonSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Socklen_T
+ *  Fix Command Arguments for Netbsd_Extra_Semicolon
  */
-static const char* apzIrix_Socklen_TPatch[] = {
+static const char* apzNetbsd_Extra_SemicolonPatch[] = {
     "format",
-    "%1#if _NO_XOPEN4 && _NO_XOPEN5\n\
-typedef int socklen_t;\n\
-#else\n\
-%2\n\
-#endif /* _NO_XOPEN4 && _NO_XOPEN5 */",
+    "#define __END_DECLS }",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Stdint_C99_Mode fix
+ *  Description of Newlib_Stdint_1 fix
  */
-tSCC zIrix_Stdint_C99_ModeName[] =
-     "irix_stdint_c99_mode";
+tSCC zNewlib_Stdint_1Name[] =
+     "newlib_stdint_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Stdint_C99_ModeList[] =
-  "stdint.h\0";
+tSCC zNewlib_Stdint_1List[] =
+  "stdint-newlib.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix_Stdint_C99_ModeMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
+#define apzNewlib_Stdint_1Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Stdint_C99_ModeSelect0[] =
-       "(#ifndef __c99\n\
-)(#error This header file is to be used only for c99 mode compilations)";
+tSCC zNewlib_Stdint_1Select0[] =
+       "@todo - Add support for wint_t types";
 
-#define    IRIX_STDINT_C99_MODE_TEST_CT  1
-static tTestDesc aIrix_Stdint_C99_ModeTests[] = {
-  { TT_EGREP,    zIrix_Stdint_C99_ModeSelect0, (regex_t*)NULL }, };
+#define    NEWLIB_STDINT_1_TEST_CT  1
+static tTestDesc aNewlib_Stdint_1Tests[] = {
+  { TT_EGREP,    zNewlib_Stdint_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Stdint_C99_Mode
+ *  Fix Command Arguments for Newlib_Stdint_1
  */
-static const char* apzIrix_Stdint_C99_ModePatch[] = {
-    "format",
-    "#if 0\n\
-%2",
+static const char* apzNewlib_Stdint_1Patch[] = { sed_cmd_z,
+    "-e", "s@#define INT32_MIN.*@#define INT32_MIN (-INT32_MAX - 1)@",
+    "-e", "s@#define INT32_MAX.*@#define INT32_MAX __INT32_MAX__@",
+    "-e", "s@#define UINT32_MAX.*@#define UINT32_MAX __UINT32_MAX__@",
+    "-e", "s@#define INT_LEAST32_MIN.*@#define INT_LEAST32_MIN (-INT_LEAST32_MAX - 1)@",
+    "-e", "s@#define INT_LEAST32_MAX.*@#define INT_LEAST32_MAX __INT_LEAST32_MAX__@",
+    "-e", "s@#define UINT_LEAST32_MAX.*@#define UINT_LEAST32_MAX __UINT_LEAST32_MAX__@",
+    "-e", "s@#define INT_FAST\\([0-9]*\\)_MIN.*@#define INT_FAST\\1_MIN (-INT_FAST\\1_MAX - 1)@",
+    "-e", "s@#define INT_FAST\\([0-9]*\\)_MAX.*@#define INT_FAST\\1_MAX __INT_FAST\\1_MAX__@",
+    "-e", "s@#define UINT_FAST\\([0-9]*\\)_MAX.*@#define UINT_FAST\\1_MAX __UINT_FAST\\1_MAX__@",
+    "-e", "s@#define SIZE_MAX.*@#define SIZE_MAX __SIZE_MAX__@",
+    "-e", "s@#define PTRDIFF_MIN.*@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@",
+    "-e", "s@#define PTRDIFF_MAX.*@#define PTRDIFF_MAX __PTRDIFF_MAX__@",
+    "-e", "s@#define UINT8_C.*@#define UINT8_C(c) __UINT8_C(c)@",
+    "-e", "s@#define UINT16_C.*@#define UINT16_C(c) __UINT16_C(c)@",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Stdint_C99_Types fix
+ *  Description of Newlib_Stdint_2 fix
  */
-tSCC zIrix_Stdint_C99_TypesName[] =
-     "irix_stdint_c99_types";
+tSCC zNewlib_Stdint_2Name[] =
+     "newlib_stdint_2";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Stdint_C99_TypesList[] =
-  "stdint-irix65.h\0stdint.h\0";
+tSCC zNewlib_Stdint_2List[] =
+  "stdint-newlib.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix_Stdint_C99_TypesMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
-#define IRIX_STDINT_C99_TYPES_TEST_CT  0
-#define aIrix_Stdint_C99_TypesTests   (tTestDesc*)NULL
+#define apzNewlib_Stdint_2Machs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zNewlib_Stdint_2Select0[] =
+       "@todo - Add support for wint_t types";
+
+#define    NEWLIB_STDINT_2_TEST_CT  1
+static tTestDesc aNewlib_Stdint_2Tests[] = {
+  { TT_EGREP,    zNewlib_Stdint_2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Stdint_C99_Types
+ *  Fix Command Arguments for Newlib_Stdint_2
  */
-static const char* apzIrix_Stdint_C99_TypesPatch[] = { sed_cmd_z,
-    "-e", "s@^#define INT64_MIN.*(-0x7fffffffffffffff - 1)$@#define INT64_MIN               (-0x7fffffffffffffffLL - 1)@",
-    "-e", "s@^#define INT64_MAX.*0x7fffffffffffffff$@#define INT64_MAX               0x7fffffffffffffffLL@",
-    "-e", "s@^#define UINT32_MAX.*0xffffffff$@#define UINT32_MAX              0xffffffffU@",
-    "-e", "s@^#define UINT64_MAX.*0xffffffffffffffff$@#define UINT64_MAX              0xffffffffffffffffULL@",
-    "-e", "s@^#define INTPTR_MIN.*INT32_MIN$@#define INTPTR_MIN              (-0x7fffffffL - 1)@",
-    "-e", "s@^#define INTPTR_MAX.*INT32_MAX$@#define INTPTR_MAX              0x7fffffffL@",
-    "-e", "s@^#define UINTPTR_MAX.*UINT32_MAX$@#define UINTPTR_MAX             0xffffffffUL@",
-    "-e", "s@^#define INTPTR_MIN.*INT64_MIN@#define INTPTR_MIN              (-0x7fffffffffffffffL - 1)@",
-    "-e", "s@^#define INTPTR_MAX.*INT64_MAX$@#define INTPTR_MAX              0x7fffffffffffffffL@",
-    "-e", "s@^#define UINTPTR_MAX.*UINT64_MAX$@#define UINTPTR_MAX             0xffffffffffffffffUL@",
-    "-e", "s@^#define PTRDIFF_MIN.*INT64_MIN$@#define PTRDIFF_MIN             (-0x7fffffffffffffffL - 1)@",
-    "-e", "s@^#define PTRDIFF_MAX.*INT64_MAX$@#define PTRDIFF_MAX             0x7fffffffffffffffL@",
-    "-e", "s@^#define SIZE_MAX.*UINT64_MAX$@#define SIZE_MAX                0xffffffffffffffffUL@",
+static const char* apzNewlib_Stdint_2Patch[] = {
+    "format",
+    "#define INTMAX_MAX __INTMAX_MAX__\n\
+#define INTMAX_MIN (-INTMAX_MAX - 1)\n\
+#define UINTMAX_MAX __UINTMAX_MAX__\n\
+#define WCHAR_MAX __WCHAR_MAX__\n\
+#define WCHAR_MIN __WCHAR_MIN__\n\
+#define WINT_MAX __WINT_MAX__\n\
+#define WINT_MIN __WINT_MIN__\n\n\
+%0",
+    "/\\*\\* Macros for minimum-width integer constant expressions \\*/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Stdint_C99_Macros fix
+ *  Description of Next_Math_Prefix fix
  */
-tSCC zIrix_Stdint_C99_MacrosName[] =
-     "irix_stdint_c99_macros";
+tSCC zNext_Math_PrefixName[] =
+     "next_math_prefix";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Stdint_C99_MacrosList[] =
-  "stdint-irix65.h\0stdint.h\0";
+tSCC zNext_Math_PrefixList[] =
+  "ansi/math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix_Stdint_C99_MacrosMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
-#define IRIX_STDINT_C99_MACROS_TEST_CT  0
-#define aIrix_Stdint_C99_MacrosTests   (tTestDesc*)NULL
+#define apzNext_Math_PrefixMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zNext_Math_PrefixSelect0[] =
+       "^extern[ \t]+double[ \t]+__const__[ \t]";
+
+#define    NEXT_MATH_PREFIX_TEST_CT  1
+static tTestDesc aNext_Math_PrefixTests[] = {
+  { TT_EGREP,    zNext_Math_PrefixSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Stdint_C99_Macros
+ *  Fix Command Arguments for Next_Math_Prefix
  */
-static const char* apzIrix_Stdint_C99_MacrosPatch[] = { sed_cmd_z,
-    "-e", "s@^#define INT8_C(x).*int.*_t.*$@#define INT8_C(x)               (x)@",
-    "-e", "s@^#define INT16_C(x).*int.*_t.*$@#define INT16_C(x)              (x)@",
-    "-e", "s@^#define INT32_C(x).*int.*_t.*$@#define INT32_C(x)              (x)@",
-    "-e", "s@^#define INT64_C(x).*int.*_t.*$@#define INT64_C(x)              (x ## LL)@",
-    "-e", "s@^#define UINT8_C(x).*int.*_t.*$@#define UINT8_C(x)              (x)@",
-    "-e", "s@^#define UINT16_C(x).*int.*_t.*$@#define UINT16_C(x)             (x)@",
-    "-e", "s@^#define UINT32_C(x).*int.*_t.*$@#define UINT32_C(x)             (x ## U)@",
-    "-e", "s@^#define UINT64_C(x).*int.*_t.*$@#define UINT64_C(x)             (x ## ULL)@",
-    "-e", "s@^#define INTMAX_C(x).*int.*_t.*$@#define INTMAX_C(x)             (x ## LL)@",
-    "-e", "s@^#define UINTMAX_C(x).*int.*_t.*$@#define UINTMAX_C(x)            (x ## ULL)@",
+static const char* apzNext_Math_PrefixPatch[] = {
+    "format",
+    "extern double %1(",
+    "^extern[ \t]+double[ \t]+__const__[ \t]+([a-z]+)\\(",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Stdio_Va_List fix
+ *  Description of Next_Template fix
  */
-tSCC zIrix_Stdio_Va_ListName[] =
-     "irix_stdio_va_list";
+tSCC zNext_TemplateName[] =
+     "next_template";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Stdio_Va_ListList[] =
-  "stdio.h\0internal/stdio_core.h\0";
+tSCC zNext_TemplateList[] =
+  "bsd/libc.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzIrix_Stdio_Va_ListMachs (const char**)NULL
+#define apzNext_TemplateMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Stdio_Va_ListSelect0[] =
-       "/\\* va_list \\*/ char \\*";
+tSCC zNext_TemplateSelect0[] =
+       "[ \t]template\\)";
 
-#define    IRIX_STDIO_VA_LIST_TEST_CT  1
-static tTestDesc aIrix_Stdio_Va_ListTests[] = {
-  { TT_EGREP,    zIrix_Stdio_Va_ListSelect0, (regex_t*)NULL }, };
+#define    NEXT_TEMPLATE_TEST_CT  1
+static tTestDesc aNext_TemplateTests[] = {
+  { TT_EGREP,    zNext_TemplateSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Stdio_Va_List
+ *  Fix Command Arguments for Next_Template
  */
-static const char* apzIrix_Stdio_Va_ListPatch[] = {
+static const char* apzNext_TemplatePatch[] = {
     "format",
-    "__gnuc_va_list",
+    "(%1)",
+    "\\(([^)]*)[ \t]template\\)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Wcsftime fix
+ *  Description of Next_Volitile fix
  */
-tSCC zIrix_WcsftimeName[] =
-     "irix_wcsftime";
+tSCC zNext_VolitileName[] =
+     "next_volitile";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_WcsftimeList[] =
-  "internal/wchar_core.h\0";
+tSCC zNext_VolitileList[] =
+  "ansi/stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix_WcsftimeMachs[] = {
-        "mips-sgi-irix6.5",
-        (const char*)NULL };
+#define apzNext_VolitileMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_WcsftimeSelect0[] =
-       "#if _NO_XOPEN5\n\
-(extern size_t[ \t]+wcsftime.*const char *.*)";
+tSCC zNext_VolitileSelect0[] =
+       "^extern[ \t]+volatile[ \t]+void[ \t]";
 
-#define    IRIX_WCSFTIME_TEST_CT  1
-static tTestDesc aIrix_WcsftimeTests[] = {
-  { TT_EGREP,    zIrix_WcsftimeSelect0, (regex_t*)NULL }, };
+#define    NEXT_VOLITILE_TEST_CT  1
+static tTestDesc aNext_VolitileTests[] = {
+  { TT_EGREP,    zNext_VolitileSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Wcsftime
+ *  Fix Command Arguments for Next_Volitile
  */
-static const char* apzIrix_WcsftimePatch[] = {
+static const char* apzNext_VolitilePatch[] = {
     "format",
-    "#if _NO_XOPEN5 && !defined(__c99)\n\
-%1",
+    "extern void %1(",
+    "^extern[ \t]+volatile[ \t]+void[ \t]+(exit|abort)\\(",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Kandr_Concat fix
+ *  Description of Next_Wait_Union fix
  */
-tSCC zKandr_ConcatName[] =
-     "kandr_concat";
+tSCC zNext_Wait_UnionName[] =
+     "next_wait_union";
 
 /*
  *  File name selection pattern
  */
-tSCC zKandr_ConcatList[] =
-  "sparc/asm_linkage.h\0sun*/asm_linkage.h\0arm/as_support.h\0arm/mc_type.h\0arm/xcb.h\0dev/chardefmac.h\0dev/ps_irq.h\0dev/screen.h\0dev/scsi.h\0sys/tty.h\0Xm.acorn/XmP.h\0bsd43/bsd43_.h\0";
+tSCC zNext_Wait_UnionList[] =
+  "sys/wait.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzKandr_ConcatMachs (const char**)NULL
+#define apzNext_Wait_UnionMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zKandr_ConcatSelect0[] =
-       "/\\*\\*/";
+tSCC zNext_Wait_UnionSelect0[] =
+       "wait\\(union wait";
 
-#define    KANDR_CONCAT_TEST_CT  1
-static tTestDesc aKandr_ConcatTests[] = {
-  { TT_EGREP,    zKandr_ConcatSelect0, (regex_t*)NULL }, };
+#define    NEXT_WAIT_UNION_TEST_CT  1
+static tTestDesc aNext_Wait_UnionTests[] = {
+  { TT_EGREP,    zNext_Wait_UnionSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Kandr_Concat
+ *  Fix Command Arguments for Next_Wait_Union
  */
-static const char* apzKandr_ConcatPatch[] = {
+static const char* apzNext_Wait_UnionPatch[] = {
     "format",
-    "##",
+    "wait(void",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Linux_Ia64_Ucontext fix
+ *  Description of Nodeent_Syntax fix
  */
-tSCC zLinux_Ia64_UcontextName[] =
-     "linux_ia64_ucontext";
+tSCC zNodeent_SyntaxName[] =
+     "nodeent_syntax";
 
 /*
  *  File name selection pattern
  */
-tSCC zLinux_Ia64_UcontextList[] =
-  "sys/ucontext.h\0";
+tSCC zNodeent_SyntaxList[] =
+  "netdnet/dnetdb.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzLinux_Ia64_UcontextMachs[] = {
-        "ia64-*-linux*",
-        (const char*)NULL };
+#define apzNodeent_SyntaxMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zLinux_Ia64_UcontextSelect0[] =
-       "\\(\\(\\(char \\*\\) &\\(\\(struct sigcontext \\*\\) 0\\)->sc_gr\\[0\\]\\) - \\(char \\*\\) 0\\)";
+tSCC zNodeent_SyntaxSelect0[] =
+       "char[ \t]*\\*na_addr[ \t]*$";
 
-#define    LINUX_IA64_UCONTEXT_TEST_CT  1
-static tTestDesc aLinux_Ia64_UcontextTests[] = {
-  { TT_EGREP,    zLinux_Ia64_UcontextSelect0, (regex_t*)NULL }, };
+#define    NODEENT_SYNTAX_TEST_CT  1
+static tTestDesc aNodeent_SyntaxTests[] = {
+  { TT_EGREP,    zNodeent_SyntaxSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Linux_Ia64_Ucontext
+ *  Fix Command Arguments for Nodeent_Syntax
  */
-static const char* apzLinux_Ia64_UcontextPatch[] = {
+static const char* apzNodeent_SyntaxPatch[] = {
     "format",
-    "__builtin_offsetof (struct sigcontext, sc_gr[0])",
+    "%0;",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Lynxos_No_Warning_In_Sys_Time_H fix
+ *  Description of Openbsd_Null_Definition fix
  */
-tSCC zLynxos_No_Warning_In_Sys_Time_HName[] =
-     "lynxos_no_warning_in_sys_time_h";
+tSCC zOpenbsd_Null_DefinitionName[] =
+     "openbsd_null_definition";
 
 /*
  *  File name selection pattern
  */
-tSCC zLynxos_No_Warning_In_Sys_Time_HList[] =
-  "sys/time.h\0";
+tSCC zOpenbsd_Null_DefinitionList[] =
+  "locale.h\0stddef.h\0stdio.h\0string.h\0time.h\0unistd.h\0wchar.h\0sys/param.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzLynxos_No_Warning_In_Sys_Time_HMachs (const char**)NULL
+tSCC* apzOpenbsd_Null_DefinitionMachs[] = {
+        "*-*-openbsd*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zLynxos_No_Warning_In_Sys_Time_HSelect0[] =
-       "#warning[ \t]+Using <time.h> instead of <sys/time.h>";
+tSCC zOpenbsd_Null_DefinitionSelect0[] =
+       "__GNUG__";
 
-#define    LYNXOS_NO_WARNING_IN_SYS_TIME_H_TEST_CT  1
-static tTestDesc aLynxos_No_Warning_In_Sys_Time_HTests[] = {
-  { TT_EGREP,    zLynxos_No_Warning_In_Sys_Time_HSelect0, (regex_t*)NULL }, };
+#define    OPENBSD_NULL_DEFINITION_TEST_CT  1
+static tTestDesc aOpenbsd_Null_DefinitionTests[] = {
+  { TT_EGREP,    zOpenbsd_Null_DefinitionSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Lynxos_No_Warning_In_Sys_Time_H
+ *  Fix Command Arguments for Openbsd_Null_Definition
  */
-static const char* apzLynxos_No_Warning_In_Sys_Time_HPatch[] = {
+static const char* apzOpenbsd_Null_DefinitionPatch[] = {
     "format",
-    "",
+    "#ifndef NULL\n\
+#ifdef __cplusplus\n\
+#ifdef __GNUG__\n\
+#define NULL\t__null\n\
+#else\t /* ! __GNUG__  */\n\
+#define NULL\t0L\n\
+#endif\t /* __GNUG__  */\n\
+#else\t /* ! __cplusplus  */\n\
+#define NULL\t((void *)0)\n\
+#endif\t /* __cplusplus  */\n\
+#endif\t /* !NULL  */",
+    "^#ifndef[ \t]*NULL\n\
+^#ifdef[ \t]*__GNUG__\n\
+^#define[ \t]*NULL[ \t]*__null\n\
+^#else\n\
+^#define[ \t]*NULL[ \t]*0L\n\
+^#endif\n\
+^#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Lynxos_Missing_Putenv fix
+ *  Description of Obstack_Lvalue_Cast fix
  */
-tSCC zLynxos_Missing_PutenvName[] =
-     "lynxos_missing_putenv";
+tSCC zObstack_Lvalue_CastName[] =
+     "obstack_lvalue_cast";
 
 /*
  *  File name selection pattern
  */
-tSCC zLynxos_Missing_PutenvList[] =
-  "stdlib.h\0";
+tSCC zObstack_Lvalue_CastList[] =
+  "obstack.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzLynxos_Missing_PutenvMachs[] = {
-        "*-*-lynxos*",
-        (const char*)NULL };
+#define apzObstack_Lvalue_CastMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zLynxos_Missing_PutenvSelect0[] =
-       "extern char \\*getenv[ \t]*_AP\\(\\(const char \\*\\)\\);";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zLynxos_Missing_PutenvBypass0[] =
-       "putenv[ \\t]*\\(";
+tSCC zObstack_Lvalue_CastSelect0[] =
+       "\\*\\(\\(([^()]*)\\*\\)(.*)\\)\\+\\+ = \\(([^()]*)\\)";
 
-#define    LYNXOS_MISSING_PUTENV_TEST_CT  2
-static tTestDesc aLynxos_Missing_PutenvTests[] = {
-  { TT_NEGREP,   zLynxos_Missing_PutenvBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zLynxos_Missing_PutenvSelect0, (regex_t*)NULL }, };
+#define    OBSTACK_LVALUE_CAST_TEST_CT  1
+static tTestDesc aObstack_Lvalue_CastTests[] = {
+  { TT_EGREP,    zObstack_Lvalue_CastSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Lynxos_Missing_Putenv
+ *  Fix Command Arguments for Obstack_Lvalue_Cast
  */
-static const char* apzLynxos_Missing_PutenvPatch[] = {
+static const char* apzObstack_Lvalue_CastPatch[] = {
     "format",
-    "%0\n\
-extern int putenv\t\t\t\t_AP((char *));",
-    "extern char \\*getenv[ \t]*_AP\\(\\(const char \\*\\)\\);",
+    "((*((%1*)%2) = (%3)), (%2 += sizeof (%1)))",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Machine_Ansi_H_Va_List fix
+ *  Description of Openbsd_Va_Start fix
  */
-tSCC zMachine_Ansi_H_Va_ListName[] =
-     "machine_ansi_h_va_list";
+tSCC zOpenbsd_Va_StartName[] =
+     "openbsd_va_start";
 
 /*
  *  File name selection pattern
  */
-#define zMachine_Ansi_H_Va_ListList (char*)NULL
+tSCC zOpenbsd_Va_StartList[] =
+  "stdarg.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzMachine_Ansi_H_Va_ListMachs (const char**)NULL
+tSCC* apzOpenbsd_Va_StartMachs[] = {
+        "*-*-openbsd*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zMachine_Ansi_H_Va_ListSelect0[] =
-       "define[ \t]+_BSD_VA_LIST_[ \t]";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zMachine_Ansi_H_Va_ListBypass0[] =
-       "__builtin_va_list";
+tSCC zOpenbsd_Va_StartSelect0[] =
+       "__builtin_stdarg_start";
 
-#define    MACHINE_ANSI_H_VA_LIST_TEST_CT  2
-static tTestDesc aMachine_Ansi_H_Va_ListTests[] = {
-  { TT_NEGREP,   zMachine_Ansi_H_Va_ListBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zMachine_Ansi_H_Va_ListSelect0, (regex_t*)NULL }, };
+#define    OPENBSD_VA_START_TEST_CT  1
+static tTestDesc aOpenbsd_Va_StartTests[] = {
+  { TT_EGREP,    zOpenbsd_Va_StartSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Machine_Ansi_H_Va_List
+ *  Fix Command Arguments for Openbsd_Va_Start
  */
-static const char* apzMachine_Ansi_H_Va_ListPatch[] = {
+static const char* apzOpenbsd_Va_StartPatch[] = {
     "format",
-    "%1__builtin_va_list",
-    "(define[ \t]+_BSD_VA_LIST_[ \t]+).*",
+    "__builtin_va_start",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Machine_Name fix
+ *  Description of Osf_Namespace_A fix
  */
-tSCC zMachine_NameName[] =
-     "machine_name";
+tSCC zOsf_Namespace_AName[] =
+     "osf_namespace_a";
 
 /*
  *  File name selection pattern
  */
-#define zMachine_NameList (char*)NULL
+tSCC zOsf_Namespace_AList[] =
+  "reg_types.h\0sys/lc_core.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzMachine_NameMachs (const char**)NULL
+#define apzOsf_Namespace_AMachs (const char**)NULL
 
 /*
- *  perform the C function call test
+ *  perform the 'test' shell command - do fix on success
  */
-tSCC zMachine_NameFTst0[] = "machine_name";
+tSCC zOsf_Namespace_ATest0[] =
+       " -r reg_types.h";
+tSCC zOsf_Namespace_ATest1[] =
+       " -r sys/lc_core.h";
+tSCC zOsf_Namespace_ATest2[] =
+       " -n \"`grep '} regex_t;' reg_types.h`\"";
+tSCC zOsf_Namespace_ATest3[] =
+       " -z \"`grep __regex_t regex.h`\"";
 
-#define    MACHINE_NAME_TEST_CT  1
-static tTestDesc aMachine_NameTests[] = {
-  { TT_FUNCTION, zMachine_NameFTst0,   0 /* unused */ }, };
+#define    OSF_NAMESPACE_A_TEST_CT  4
+static tTestDesc aOsf_Namespace_ATests[] = {
+  { TT_TEST,     zOsf_Namespace_ATest0,   0 /* unused */ },
+  { TT_TEST,     zOsf_Namespace_ATest1,   0 /* unused */ },
+  { TT_TEST,     zOsf_Namespace_ATest2,   0 /* unused */ },
+  { TT_TEST,     zOsf_Namespace_ATest3,   0 /* unused */ }, };
 
 /*
- *  Fix Command Arguments for Machine_Name
+ *  Fix Command Arguments for Osf_Namespace_A
  */
-static const char* apzMachine_NamePatch[] = {
-    "machine_name",
+static const char* apzOsf_Namespace_APatch[] = {
+    "format",
+    "__%0",
+    "reg(ex|off|match)_t",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Math_Exception fix
+ *  Description of Osf_Namespace_C fix
  */
-tSCC zMath_ExceptionName[] =
-     "math_exception";
+tSCC zOsf_Namespace_CName[] =
+     "osf_namespace_c";
 
 /*
  *  File name selection pattern
  */
-tSCC zMath_ExceptionList[] =
-  "math.h\0";
+tSCC zOsf_Namespace_CList[] =
+  "regex.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzMath_ExceptionMachs (const char**)NULL
+#define apzOsf_Namespace_CMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zMath_ExceptionSelect0[] =
-       "struct exception";
+tSCC zOsf_Namespace_CSelect0[] =
+       "#include <reg_types.h>.*";
 
 /*
- *  content bypass pattern - skip fix if pattern found
+ *  perform the 'test' shell command - do fix on success
  */
-tSCC zMath_ExceptionBypass0[] =
-       "We have a problem when using C\\+\\+|for C\\+\\+, _[a-z0-9A-Z_]+_exception; for C, exception";
+tSCC zOsf_Namespace_CTest0[] =
+       " -r reg_types.h";
+tSCC zOsf_Namespace_CTest1[] =
+       " -r sys/lc_core.h";
+tSCC zOsf_Namespace_CTest2[] =
+       " -n \"`grep '} regex_t;' reg_types.h`\"";
+tSCC zOsf_Namespace_CTest3[] =
+       " -z \"`grep __regex_t regex.h`\"";
 
-#define    MATH_EXCEPTION_TEST_CT  2
-static tTestDesc aMath_ExceptionTests[] = {
-  { TT_NEGREP,   zMath_ExceptionBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zMath_ExceptionSelect0, (regex_t*)NULL }, };
+#define    OSF_NAMESPACE_C_TEST_CT  5
+static tTestDesc aOsf_Namespace_CTests[] = {
+  { TT_TEST,     zOsf_Namespace_CTest0,   0 /* unused */ },
+  { TT_TEST,     zOsf_Namespace_CTest1,   0 /* unused */ },
+  { TT_TEST,     zOsf_Namespace_CTest2,   0 /* unused */ },
+  { TT_TEST,     zOsf_Namespace_CTest3,   0 /* unused */ },
+  { TT_EGREP,    zOsf_Namespace_CSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Math_Exception
+ *  Fix Command Arguments for Osf_Namespace_C
  */
-static const char* apzMath_ExceptionPatch[] = {
-    "wrap",
-    "#ifdef __cplusplus\n\
-#define exception __math_exception\n\
-#endif\n",
-    "#ifdef __cplusplus\n\
-#undef exception\n\
-#endif\n",
+static const char* apzOsf_Namespace_CPatch[] = {
+    "format",
+    "%0\n\
+typedef __regex_t\tregex_t;\n\
+typedef __regoff_t\tregoff_t;\n\
+typedef __regmatch_t\tregmatch_t;",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Math_Huge_Val_From_Dbl_Max fix
+ *  Description of Pthread_Incomplete_Struct_Argument fix
  */
-tSCC zMath_Huge_Val_From_Dbl_MaxName[] =
-     "math_huge_val_from_dbl_max";
+tSCC zPthread_Incomplete_Struct_ArgumentName[] =
+     "pthread_incomplete_struct_argument";
 
 /*
  *  File name selection pattern
  */
-tSCC zMath_Huge_Val_From_Dbl_MaxList[] =
-  "math.h\0";
+tSCC zPthread_Incomplete_Struct_ArgumentList[] =
+  "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzMath_Huge_Val_From_Dbl_MaxMachs (const char**)NULL
+#define apzPthread_Incomplete_Struct_ArgumentMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zMath_Huge_Val_From_Dbl_MaxSelect0[] =
-       "define[ \t]+HUGE_VAL[ \t]+DBL_MAX";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zMath_Huge_Val_From_Dbl_MaxBypass0[] =
-       "define[ \t]+DBL_MAX";
+tSCC zPthread_Incomplete_Struct_ArgumentSelect0[] =
+       "struct __jmp_buf_tag";
 
-#define    MATH_HUGE_VAL_FROM_DBL_MAX_TEST_CT  2
-static tTestDesc aMath_Huge_Val_From_Dbl_MaxTests[] = {
-  { TT_NEGREP,   zMath_Huge_Val_From_Dbl_MaxBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zMath_Huge_Val_From_Dbl_MaxSelect0, (regex_t*)NULL }, };
+#define    PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT  1
+static tTestDesc aPthread_Incomplete_Struct_ArgumentTests[] = {
+  { TT_EGREP,    zPthread_Incomplete_Struct_ArgumentSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Math_Huge_Val_From_Dbl_Max
+ *  Fix Command Arguments for Pthread_Incomplete_Struct_Argument
  */
-static const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c",
-    "\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h | sed 's/.*DBL_MAX[ \t]*//' 2>/dev/null`\n\n\
-\tif ( test -n \"${dbl_max_def}\" ) > /dev/null 2>&1\n\
-\tthen sed -e '/define[ \t]*HUGE_VAL[ \t]*DBL_MAX/s@DBL_MAX@'\"$dbl_max_def@\"\n\
-\telse cat\n\
-\tfi",
+static const char* apzPthread_Incomplete_Struct_ArgumentPatch[] = {
+    "format",
+    "%1 *%2%3",
+    "^(extern int __sigsetjmp \\(struct __jmp_buf_tag) (__env)\\[1\\](.*)$",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Nested_Auth_Des fix
+ *  Description of Read_Ret_Type fix
  */
-tSCC zNested_Auth_DesName[] =
-     "nested_auth_des";
+tSCC zRead_Ret_TypeName[] =
+     "read_ret_type";
 
 /*
  *  File name selection pattern
  */
-tSCC zNested_Auth_DesList[] =
-  "rpc/rpc.h\0";
+tSCC zRead_Ret_TypeList[] =
+  "stdio.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzNested_Auth_DesMachs (const char**)NULL
+#define apzRead_Ret_TypeMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zNested_Auth_DesSelect0[] =
-       "(/\\*.*rpc/auth_des\\.h>.*)/\\*";
+tSCC zRead_Ret_TypeSelect0[] =
+       "extern int\t.*, fread\\(\\), fwrite\\(\\)";
 
-#define    NESTED_AUTH_DES_TEST_CT  1
-static tTestDesc aNested_Auth_DesTests[] = {
-  { TT_EGREP,    zNested_Auth_DesSelect0, (regex_t*)NULL }, };
+#define    READ_RET_TYPE_TEST_CT  1
+static tTestDesc aRead_Ret_TypeTests[] = {
+  { TT_EGREP,    zRead_Ret_TypeSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Nested_Auth_Des
+ *  Fix Command Arguments for Read_Ret_Type
  */
-static const char* apzNested_Auth_DesPatch[] = {
+static const char* apzRead_Ret_TypePatch[] = {
     "format",
-    "%1*/ /*",
+    "extern unsigned int fread(), fwrite();\n\
+%1%2",
+    "(extern int\t.*), fread\\(\\), fwrite\\(\\)(.*)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Netbsd_C99_Inline_1 fix
+ *  Description of Rpc_Xdr_Lvalue_Cast_A fix
  */
-tSCC zNetbsd_C99_Inline_1Name[] =
-     "netbsd_c99_inline_1";
+tSCC zRpc_Xdr_Lvalue_Cast_AName[] =
+     "rpc_xdr_lvalue_cast_a";
 
 /*
  *  File name selection pattern
  */
-tSCC zNetbsd_C99_Inline_1List[] =
-  "signal.h\0";
+tSCC zRpc_Xdr_Lvalue_Cast_AList[] =
+  "rpc/xdr.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzNetbsd_C99_Inline_1Machs[] = {
-        "*-*-netbsd*",
-        (const char*)NULL };
+#define apzRpc_Xdr_Lvalue_Cast_AMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zNetbsd_C99_Inline_1Select0[] =
-       "extern __inline int";
+tSCC zRpc_Xdr_Lvalue_Cast_ASelect0[] =
+       "#define[ \t]*IXDR_GET_LONG.*\\\\\n\
+.*__extension__.*";
 
-#define    NETBSD_C99_INLINE_1_TEST_CT  1
-static tTestDesc aNetbsd_C99_Inline_1Tests[] = {
-  { TT_EGREP,    zNetbsd_C99_Inline_1Select0, (regex_t*)NULL }, };
+#define    RPC_XDR_LVALUE_CAST_A_TEST_CT  1
+static tTestDesc aRpc_Xdr_Lvalue_Cast_ATests[] = {
+  { TT_EGREP,    zRpc_Xdr_Lvalue_Cast_ASelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Netbsd_C99_Inline_1
+ *  Fix Command Arguments for Rpc_Xdr_Lvalue_Cast_A
  */
-static const char* apzNetbsd_C99_Inline_1Patch[] = {
+static const char* apzRpc_Xdr_Lvalue_Cast_APatch[] = {
     "format",
-    "extern\n\
-#ifdef __GNUC_STDC_INLINE__\n\
-__attribute__((__gnu_inline__))\n\
-#endif\n\
-__inline int",
+    "#define IXDR_GET_LONG(buf) ((long)IXDR_GET_U_INT32(buf))",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Netbsd_C99_Inline_2 fix
+ *  Description of Rpc_Xdr_Lvalue_Cast_B fix
  */
-tSCC zNetbsd_C99_Inline_2Name[] =
-     "netbsd_c99_inline_2";
+tSCC zRpc_Xdr_Lvalue_Cast_BName[] =
+     "rpc_xdr_lvalue_cast_b";
 
 /*
  *  File name selection pattern
  */
-tSCC zNetbsd_C99_Inline_2List[] =
-  "signal.h\0";
+tSCC zRpc_Xdr_Lvalue_Cast_BList[] =
+  "rpc/xdr.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzNetbsd_C99_Inline_2Machs[] = {
-        "*-*-netbsd*",
-        (const char*)NULL };
+#define apzRpc_Xdr_Lvalue_Cast_BMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zNetbsd_C99_Inline_2Select0[] =
-       "#define _SIGINLINE extern __inline";
+tSCC zRpc_Xdr_Lvalue_Cast_BSelect0[] =
+       "#define[ \t]*IXDR_PUT_LONG.*\\\\\n\
+.*__extension__.*";
 
-#define    NETBSD_C99_INLINE_2_TEST_CT  1
-static tTestDesc aNetbsd_C99_Inline_2Tests[] = {
-  { TT_EGREP,    zNetbsd_C99_Inline_2Select0, (regex_t*)NULL }, };
+#define    RPC_XDR_LVALUE_CAST_B_TEST_CT  1
+static tTestDesc aRpc_Xdr_Lvalue_Cast_BTests[] = {
+  { TT_EGREP,    zRpc_Xdr_Lvalue_Cast_BSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Netbsd_C99_Inline_2
+ *  Fix Command Arguments for Rpc_Xdr_Lvalue_Cast_B
  */
-static const char* apzNetbsd_C99_Inline_2Patch[] = {
+static const char* apzRpc_Xdr_Lvalue_Cast_BPatch[] = {
     "format",
-    "#ifdef __GNUC_STDC_INLINE__\n\
-#define _SIGINLINE extern __attribute__((__gnu_inline__)) __inline\n\
-#else\n\
-%0\n\
-#endif",
+    "#define IXDR_PUT_LONG(buf, v) ((long)IXDR_PUT_INT32(buf, (long)(v)))",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Netbsd_Extra_Semicolon fix
+ *  Description of Rs6000_Double fix
  */
-tSCC zNetbsd_Extra_SemicolonName[] =
-     "netbsd_extra_semicolon";
+tSCC zRs6000_DoubleName[] =
+     "rs6000_double";
 
 /*
  *  File name selection pattern
  */
-tSCC zNetbsd_Extra_SemicolonList[] =
-  "sys/cdefs.h\0";
+tSCC zRs6000_DoubleList[] =
+  "math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzNetbsd_Extra_SemicolonMachs[] = {
-        "*-*-netbsd*",
-        (const char*)NULL };
+#define apzRs6000_DoubleMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zNetbsd_Extra_SemicolonSelect0[] =
-       "#define[ \t]*__END_DECLS[ \t]*};";
+tSCC zRs6000_DoubleSelect0[] =
+       "[^a-zA-Z_]class\\(";
 
-#define    NETBSD_EXTRA_SEMICOLON_TEST_CT  1
-static tTestDesc aNetbsd_Extra_SemicolonTests[] = {
-  { TT_EGREP,    zNetbsd_Extra_SemicolonSelect0, (regex_t*)NULL }, };
+#define    RS6000_DOUBLE_TEST_CT  1
+static tTestDesc aRs6000_DoubleTests[] = {
+  { TT_EGREP,    zRs6000_DoubleSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Netbsd_Extra_Semicolon
+ *  Fix Command Arguments for Rs6000_Double
  */
-static const char* apzNetbsd_Extra_SemicolonPatch[] = {
+static const char* apzRs6000_DoublePatch[] = {
     "format",
-    "#define __END_DECLS }",
+    "#ifndef __cplusplus\n\
+%0\n\
+#endif",
+    "^.*[^a-zA-Z_]class\\(.*",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Newlib_Stdint_1 fix
+ *  Description of Rs6000_Fchmod fix
  */
-tSCC zNewlib_Stdint_1Name[] =
-     "newlib_stdint_1";
+tSCC zRs6000_FchmodName[] =
+     "rs6000_fchmod";
 
 /*
  *  File name selection pattern
  */
-tSCC zNewlib_Stdint_1List[] =
-  "stdint-newlib.h\0stdint.h\0";
+tSCC zRs6000_FchmodList[] =
+  "sys/stat.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzNewlib_Stdint_1Machs (const char**)NULL
+#define apzRs6000_FchmodMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zNewlib_Stdint_1Select0[] =
-       "@todo - Add support for wint_t types";
+tSCC zRs6000_FchmodSelect0[] =
+       "fchmod\\(char \\*";
 
-#define    NEWLIB_STDINT_1_TEST_CT  1
-static tTestDesc aNewlib_Stdint_1Tests[] = {
-  { TT_EGREP,    zNewlib_Stdint_1Select0, (regex_t*)NULL }, };
+#define    RS6000_FCHMOD_TEST_CT  1
+static tTestDesc aRs6000_FchmodTests[] = {
+  { TT_EGREP,    zRs6000_FchmodSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Newlib_Stdint_1
+ *  Fix Command Arguments for Rs6000_Fchmod
  */
-static const char* apzNewlib_Stdint_1Patch[] = { sed_cmd_z,
-    "-e", "s@#define INT32_MIN.*@#define INT32_MIN (-INT32_MAX - 1)@",
-    "-e", "s@#define INT32_MAX.*@#define INT32_MAX __INT32_MAX__@",
-    "-e", "s@#define UINT32_MAX.*@#define UINT32_MAX __UINT32_MAX__@",
-    "-e", "s@#define INT_LEAST32_MIN.*@#define INT_LEAST32_MIN (-INT_LEAST32_MAX - 1)@",
-    "-e", "s@#define INT_LEAST32_MAX.*@#define INT_LEAST32_MAX __INT_LEAST32_MAX__@",
-    "-e", "s@#define UINT_LEAST32_MAX.*@#define UINT_LEAST32_MAX __UINT_LEAST32_MAX__@",
-    "-e", "s@#define INT_FAST\\([0-9]*\\)_MIN.*@#define INT_FAST\\1_MIN (-INT_FAST\\1_MAX - 1)@",
-    "-e", "s@#define INT_FAST\\([0-9]*\\)_MAX.*@#define INT_FAST\\1_MAX __INT_FAST\\1_MAX__@",
-    "-e", "s@#define UINT_FAST\\([0-9]*\\)_MAX.*@#define UINT_FAST\\1_MAX __UINT_FAST\\1_MAX__@",
-    "-e", "s@#define SIZE_MAX.*@#define SIZE_MAX __SIZE_MAX__@",
-    "-e", "s@#define PTRDIFF_MIN.*@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@",
-    "-e", "s@#define PTRDIFF_MAX.*@#define PTRDIFF_MAX __PTRDIFF_MAX__@",
-    "-e", "s@#define UINT8_C.*@#define UINT8_C(c) __UINT8_C(c)@",
-    "-e", "s@#define UINT16_C.*@#define UINT16_C(c) __UINT16_C(c)@",
+static const char* apzRs6000_FchmodPatch[] = {
+    "format",
+    "fchmod(int",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Newlib_Stdint_2 fix
+ *  Description of Rs6000_Param fix
  */
-tSCC zNewlib_Stdint_2Name[] =
-     "newlib_stdint_2";
+tSCC zRs6000_ParamName[] =
+     "rs6000_param";
 
 /*
  *  File name selection pattern
  */
-tSCC zNewlib_Stdint_2List[] =
-  "stdint-newlib.h\0stdint.h\0";
+tSCC zRs6000_ParamList[] =
+  "stdio.h\0unistd.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzNewlib_Stdint_2Machs (const char**)NULL
+#define apzRs6000_ParamMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zNewlib_Stdint_2Select0[] =
-       "@todo - Add support for wint_t types";
+tSCC zRs6000_ParamSelect0[] =
+       "rename\\(const char \\*old, const char \\*new\\)";
 
-#define    NEWLIB_STDINT_2_TEST_CT  1
-static tTestDesc aNewlib_Stdint_2Tests[] = {
-  { TT_EGREP,    zNewlib_Stdint_2Select0, (regex_t*)NULL }, };
+#define    RS6000_PARAM_TEST_CT  1
+static tTestDesc aRs6000_ParamTests[] = {
+  { TT_EGREP,    zRs6000_ParamSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Newlib_Stdint_2
+ *  Fix Command Arguments for Rs6000_Param
  */
-static const char* apzNewlib_Stdint_2Patch[] = {
+static const char* apzRs6000_ParamPatch[] = {
     "format",
-    "#define INTMAX_MAX __INTMAX_MAX__\n\
-#define INTMAX_MIN (-INTMAX_MAX - 1)\n\
-#define UINTMAX_MAX __UINTMAX_MAX__\n\
-#define WCHAR_MAX __WCHAR_MAX__\n\
-#define WCHAR_MIN __WCHAR_MIN__\n\
-#define WINT_MAX __WINT_MAX__\n\
-#define WINT_MIN __WINT_MIN__\n\n\
-%0",
-    "/\\*\\* Macros for minimum-width integer constant expressions \\*/",
+    "rename(const char *_old, const char *_new)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Next_Math_Prefix fix
+ *  Description of Solaris___Restrict fix
  */
-tSCC zNext_Math_PrefixName[] =
-     "next_math_prefix";
+tSCC zSolaris___RestrictName[] =
+     "solaris___restrict";
 
 /*
  *  File name selection pattern
  */
-tSCC zNext_Math_PrefixList[] =
-  "ansi/math.h\0";
+tSCC zSolaris___RestrictList[] =
+  "sys/feature_tests.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzNext_Math_PrefixMachs (const char**)NULL
+tSCC* apzSolaris___RestrictMachs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zNext_Math_PrefixSelect0[] =
-       "^extern[ \t]+double[ \t]+__const__[ \t]";
+tSCC zSolaris___RestrictSelect0[] =
+       "#define[ \t]*_RESTRICT_KYWD[ \t]*restrict";
 
-#define    NEXT_MATH_PREFIX_TEST_CT  1
-static tTestDesc aNext_Math_PrefixTests[] = {
-  { TT_EGREP,    zNext_Math_PrefixSelect0, (regex_t*)NULL }, };
+#define    SOLARIS___RESTRICT_TEST_CT  1
+static tTestDesc aSolaris___RestrictTests[] = {
+  { TT_EGREP,    zSolaris___RestrictSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Next_Math_Prefix
+ *  Fix Command Arguments for Solaris___Restrict
  */
-static const char* apzNext_Math_PrefixPatch[] = {
+static const char* apzSolaris___RestrictPatch[] = {
     "format",
-    "extern double %1(",
-    "^extern[ \t]+double[ \t]+__const__[ \t]+([a-z]+)\\(",
+    "#ifdef __cplusplus\n\
+#define\t_RESTRICT_KYWD\t__restrict\n\
+#else\n\
+%0\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Next_Template fix
+ *  Description of Solaris_Complex fix
  */
-tSCC zNext_TemplateName[] =
-     "next_template";
+tSCC zSolaris_ComplexName[] =
+     "solaris_complex";
 
 /*
  *  File name selection pattern
  */
-tSCC zNext_TemplateList[] =
-  "bsd/libc.h\0";
+tSCC zSolaris_ComplexList[] =
+  "complex.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzNext_TemplateMachs (const char**)NULL
+tSCC* apzSolaris_ComplexMachs[] = {
+        "*-*-solaris2.*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zNext_TemplateSelect0[] =
-       "[ \t]template\\)";
+tSCC zSolaris_ComplexSelect0[] =
+       "#define[ \t]_Complex_I[ \t]_Complex_I";
 
-#define    NEXT_TEMPLATE_TEST_CT  1
-static tTestDesc aNext_TemplateTests[] = {
-  { TT_EGREP,    zNext_TemplateSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_COMPLEX_TEST_CT  1
+static tTestDesc aSolaris_ComplexTests[] = {
+  { TT_EGREP,    zSolaris_ComplexSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Next_Template
+ *  Fix Command Arguments for Solaris_Complex
  */
-static const char* apzNext_TemplatePatch[] = {
-    "format",
-    "(%1)",
-    "\\(([^)]*)[ \t]template\\)",
+static const char* apzSolaris_ComplexPatch[] = { sed_cmd_z,
+    "-e", "s/#define[ \t]_Complex_I[ \t]_Complex_I/#define\t_Complex_I\t(__extension__ 1.0iF)/",
+    "-e", "/#define[ \t]_Imaginary_I[ \t]_Imaginary_I/d",
+    "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d",
+    "-e", "s/#define[ \t]I[ \t]\\{1,\\}_Imaginary_I/#define\tI\t\t_Complex_I/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Next_Volitile fix
+ *  Description of Solaris_Complex_Cxx fix
  */
-tSCC zNext_VolitileName[] =
-     "next_volitile";
+tSCC zSolaris_Complex_CxxName[] =
+     "solaris_complex_cxx";
 
 /*
  *  File name selection pattern
  */
-tSCC zNext_VolitileList[] =
-  "ansi/stdlib.h\0";
+tSCC zSolaris_Complex_CxxList[] =
+  "complex.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzNext_VolitileMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zNext_VolitileSelect0[] =
-       "^extern[ \t]+volatile[ \t]+void[ \t]";
-
-#define    NEXT_VOLITILE_TEST_CT  1
-static tTestDesc aNext_VolitileTests[] = {
-  { TT_EGREP,    zNext_VolitileSelect0, (regex_t*)NULL }, };
+tSCC* apzSolaris_Complex_CxxMachs[] = {
+        "*-*-solaris2.*",
+        (const char*)NULL };
+#define SOLARIS_COMPLEX_CXX_TEST_CT  0
+#define aSolaris_Complex_CxxTests   (tTestDesc*)NULL
 
 /*
- *  Fix Command Arguments for Next_Volitile
+ *  Fix Command Arguments for Solaris_Complex_Cxx
  */
-static const char* apzNext_VolitilePatch[] = {
-    "format",
-    "extern void %1(",
-    "^extern[ \t]+volatile[ \t]+void[ \t]+(exit|abort)\\(",
+static const char* apzSolaris_Complex_CxxPatch[] = { sed_cmd_z,
+    "-e", "/#if[ \t]*!defined(__cplusplus)/c\\\n\
+#ifdef\t__cplusplus\\\n\
+extern \"C\" {\\\n\
+#endif",
+    "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n\
+#ifdef\t__cplusplus\\\n\
+}\\\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Next_Wait_Union fix
+ *  Description of Solaris_Cxx_Linkage fix
  */
-tSCC zNext_Wait_UnionName[] =
-     "next_wait_union";
+tSCC zSolaris_Cxx_LinkageName[] =
+     "solaris_cxx_linkage";
 
 /*
  *  File name selection pattern
  */
-tSCC zNext_Wait_UnionList[] =
-  "sys/wait.h\0";
+tSCC zSolaris_Cxx_LinkageList[] =
+  "iso/stdlib_iso.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzNext_Wait_UnionMachs (const char**)NULL
+tSCC* apzSolaris_Cxx_LinkageMachs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zNext_Wait_UnionSelect0[] =
-       "wait\\(union wait";
+tSCC zSolaris_Cxx_LinkageSelect0[] =
+       "(#if __cplusplus >= 199711L)\n\
+(extern \"C\\+\\+\" \\{\n\
+)(.*(bsearch|qsort).*)";
 
-#define    NEXT_WAIT_UNION_TEST_CT  1
-static tTestDesc aNext_Wait_UnionTests[] = {
-  { TT_EGREP,    zNext_Wait_UnionSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_CXX_LINKAGE_TEST_CT  1
+static tTestDesc aSolaris_Cxx_LinkageTests[] = {
+  { TT_EGREP,    zSolaris_Cxx_LinkageSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Next_Wait_Union
+ *  Fix Command Arguments for Solaris_Cxx_Linkage
  */
-static const char* apzNext_Wait_UnionPatch[] = {
+static const char* apzSolaris_Cxx_LinkagePatch[] = {
     "format",
-    "wait(void",
+    "%1 && !__GNUG__\n\
+%2%3",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Nodeent_Syntax fix
+ *  Description of Solaris_Getc_Strict_Stdc fix
  */
-tSCC zNodeent_SyntaxName[] =
-     "nodeent_syntax";
+tSCC zSolaris_Getc_Strict_StdcName[] =
+     "solaris_getc_strict_stdc";
 
 /*
  *  File name selection pattern
  */
-tSCC zNodeent_SyntaxList[] =
-  "netdnet/dnetdb.h\0";
+tSCC zSolaris_Getc_Strict_StdcList[] =
+  "iso/stdio_iso.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzNodeent_SyntaxMachs (const char**)NULL
+tSCC* apzSolaris_Getc_Strict_StdcMachs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zNodeent_SyntaxSelect0[] =
-       "char[ \t]*\\*na_addr[ \t]*$";
+tSCC zSolaris_Getc_Strict_StdcSelect0[] =
+       "(.*&& )!defined\\(_STRICT_STDC\\)(.*)";
 
-#define    NODEENT_SYNTAX_TEST_CT  1
-static tTestDesc aNodeent_SyntaxTests[] = {
-  { TT_EGREP,    zNodeent_SyntaxSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_GETC_STRICT_STDC_TEST_CT  1
+static tTestDesc aSolaris_Getc_Strict_StdcTests[] = {
+  { TT_EGREP,    zSolaris_Getc_Strict_StdcSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Nodeent_Syntax
+ *  Fix Command Arguments for Solaris_Getc_Strict_Stdc
  */
-static const char* apzNodeent_SyntaxPatch[] = {
+static const char* apzSolaris_Getc_Strict_StdcPatch[] = {
     "format",
-    "%0;",
+    "%1(!defined(_STRICT_STDC) || (__cplusplus >= 199711L))%2",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Openbsd_Null_Definition fix
+ *  Description of Solaris_Gets_C11 fix
  */
-tSCC zOpenbsd_Null_DefinitionName[] =
-     "openbsd_null_definition";
+tSCC zSolaris_Gets_C11Name[] =
+     "solaris_gets_c11";
 
 /*
  *  File name selection pattern
  */
-tSCC zOpenbsd_Null_DefinitionList[] =
-  "locale.h\0stddef.h\0stdio.h\0string.h\0time.h\0unistd.h\0wchar.h\0sys/param.h\0";
+tSCC zSolaris_Gets_C11List[] =
+  "iso/stdio_iso.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzOpenbsd_Null_DefinitionMachs[] = {
-        "*-*-openbsd*",
+tSCC* apzSolaris_Gets_C11Machs[] = {
+        "*-*-solaris2*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zOpenbsd_Null_DefinitionSelect0[] =
-       "__GNUG__";
+tSCC zSolaris_Gets_C11Select0[] =
+       "(extern char[ \t]*\\*gets\\(char \\*\\));";
 
-#define    OPENBSD_NULL_DEFINITION_TEST_CT  1
-static tTestDesc aOpenbsd_Null_DefinitionTests[] = {
-  { TT_EGREP,    zOpenbsd_Null_DefinitionSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_GETS_C11_TEST_CT  1
+static tTestDesc aSolaris_Gets_C11Tests[] = {
+  { TT_EGREP,    zSolaris_Gets_C11Select0, (regex_t*)NULL }, };
 
-/*
- *  Fix Command Arguments for Openbsd_Null_Definition
- */
-static const char* apzOpenbsd_Null_DefinitionPatch[] = {
-    "format",
-    "#ifndef NULL\n\
-#ifdef __cplusplus\n\
-#ifdef __GNUG__\n\
-#define NULL\t__null\n\
-#else\t /* ! __GNUG__  */\n\
-#define NULL\t0L\n\
-#endif\t /* __GNUG__  */\n\
-#else\t /* ! __cplusplus  */\n\
-#define NULL\t((void *)0)\n\
-#endif\t /* __cplusplus  */\n\
-#endif\t /* !NULL  */",
-    "^#ifndef[ \t]*NULL\n\
-^#ifdef[ \t]*__GNUG__\n\
-^#define[ \t]*NULL[ \t]*__null\n\
-^#else\n\
-^#define[ \t]*NULL[ \t]*0L\n\
-^#endif\n\
-^#endif",
+/*
+ *  Fix Command Arguments for Solaris_Gets_C11
+ */
+static const char* apzSolaris_Gets_C11Patch[] = {
+    "format",
+    "#if __STDC_VERSION__ < 201112L && __cplusplus < 201402L\n\
+%1 __attribute__((__deprecated__));\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Obstack_Lvalue_Cast fix
+ *  Description of Solaris_Gets_Cxx14 fix
  */
-tSCC zObstack_Lvalue_CastName[] =
-     "obstack_lvalue_cast";
+tSCC zSolaris_Gets_Cxx14Name[] =
+     "solaris_gets_cxx14";
 
 /*
  *  File name selection pattern
  */
-tSCC zObstack_Lvalue_CastList[] =
-  "obstack.h\0";
+tSCC zSolaris_Gets_Cxx14List[] =
+  "iso/stdio_iso.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzObstack_Lvalue_CastMachs (const char**)NULL
+tSCC* apzSolaris_Gets_Cxx14Machs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zObstack_Lvalue_CastSelect0[] =
-       "\\*\\(\\(([^()]*)\\*\\)(.*)\\)\\+\\+ = \\(([^()]*)\\)";
+tSCC zSolaris_Gets_Cxx14Select0[] =
+       "(#if __STDC_VERSION__ < 201112L)\n\
+(extern char\t\\*gets\\(char \\*\\) __ATTR_DEPRECATED;)";
 
-#define    OBSTACK_LVALUE_CAST_TEST_CT  1
-static tTestDesc aObstack_Lvalue_CastTests[] = {
-  { TT_EGREP,    zObstack_Lvalue_CastSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_GETS_CXX14_TEST_CT  1
+static tTestDesc aSolaris_Gets_Cxx14Tests[] = {
+  { TT_EGREP,    zSolaris_Gets_Cxx14Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Obstack_Lvalue_Cast
+ *  Fix Command Arguments for Solaris_Gets_Cxx14
  */
-static const char* apzObstack_Lvalue_CastPatch[] = {
+static const char* apzSolaris_Gets_Cxx14Patch[] = {
     "format",
-    "((*((%1*)%2) = (%3)), (%2 += sizeof (%1)))",
+    "%1 && __cplusplus < 201402L\n\
+%2",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Openbsd_Va_Start fix
+ *  Description of Solaris_Int_Const fix
  */
-tSCC zOpenbsd_Va_StartName[] =
-     "openbsd_va_start";
+tSCC zSolaris_Int_ConstName[] =
+     "solaris_int_const";
 
 /*
  *  File name selection pattern
  */
-tSCC zOpenbsd_Va_StartList[] =
-  "stdarg.h\0";
+tSCC zSolaris_Int_ConstList[] =
+  "sys/int_const.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzOpenbsd_Va_StartMachs[] = {
-        "*-*-openbsd*",
+tSCC* apzSolaris_Int_ConstMachs[] = {
+        "*-*-solaris2*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zOpenbsd_Va_StartSelect0[] =
-       "__builtin_stdarg_start";
+tSCC zSolaris_Int_ConstSelect0[] =
+       "^#define[ \t]+UINT8_C\\(c\\)[ \t]+__CONCAT__.*\n\
+(/*.**/)\n\
+#define[ \t]+UINT16_C\\(c\\)[ \t]+__CONCAT__.*";
 
-#define    OPENBSD_VA_START_TEST_CT  1
-static tTestDesc aOpenbsd_Va_StartTests[] = {
-  { TT_EGREP,    zOpenbsd_Va_StartSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_INT_CONST_TEST_CT  1
+static tTestDesc aSolaris_Int_ConstTests[] = {
+  { TT_EGREP,    zSolaris_Int_ConstSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Openbsd_Va_Start
+ *  Fix Command Arguments for Solaris_Int_Const
  */
-static const char* apzOpenbsd_Va_StartPatch[] = {
+static const char* apzSolaris_Int_ConstPatch[] = {
     "format",
-    "__builtin_va_start",
+    "#define\tUINT8_C(c)\t(c)\n\
+%1\n\
+#define\tUINT16_C(c)\t(c)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Osf_Namespace_A fix
+ *  Description of Solaris_Int_Limits_1 fix
  */
-tSCC zOsf_Namespace_AName[] =
-     "osf_namespace_a";
+tSCC zSolaris_Int_Limits_1Name[] =
+     "solaris_int_limits_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zOsf_Namespace_AList[] =
-  "reg_types.h\0sys/lc_core.h\0";
+tSCC zSolaris_Int_Limits_1List[] =
+  "sys/int_limits.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzOsf_Namespace_AMachs (const char**)NULL
+tSCC* apzSolaris_Int_Limits_1Machs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
- *  perform the 'test' shell command - do fix on success
+ *  content selection pattern - do fix if pattern found
  */
-tSCC zOsf_Namespace_ATest0[] =
-       " -r reg_types.h";
-tSCC zOsf_Namespace_ATest1[] =
-       " -r sys/lc_core.h";
-tSCC zOsf_Namespace_ATest2[] =
-       " -n \"`grep '} regex_t;' reg_types.h`\"";
-tSCC zOsf_Namespace_ATest3[] =
-       " -z \"`grep __regex_t regex.h`\"";
+tSCC zSolaris_Int_Limits_1Select0[] =
+       "^#define[ \t]+UINT8_MAX[ \t]+\\(255U\\)\n\
+#define[ \t]+UINT16_MAX[ \t]+\\(65535U\\)";
 
-#define    OSF_NAMESPACE_A_TEST_CT  4
-static tTestDesc aOsf_Namespace_ATests[] = {
-  { TT_TEST,     zOsf_Namespace_ATest0,   0 /* unused */ },
-  { TT_TEST,     zOsf_Namespace_ATest1,   0 /* unused */ },
-  { TT_TEST,     zOsf_Namespace_ATest2,   0 /* unused */ },
-  { TT_TEST,     zOsf_Namespace_ATest3,   0 /* unused */ }, };
+#define    SOLARIS_INT_LIMITS_1_TEST_CT  1
+static tTestDesc aSolaris_Int_Limits_1Tests[] = {
+  { TT_EGREP,    zSolaris_Int_Limits_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Osf_Namespace_A
+ *  Fix Command Arguments for Solaris_Int_Limits_1
  */
-static const char* apzOsf_Namespace_APatch[] = {
+static const char* apzSolaris_Int_Limits_1Patch[] = {
     "format",
-    "__%0",
-    "reg(ex|off|match)_t",
+    "#define\tUINT8_MAX\t(255)\n\
+#define\tUINT16_MAX\t(65535)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Osf_Namespace_C fix
+ *  Description of Solaris_Int_Limits_2 fix
  */
-tSCC zOsf_Namespace_CName[] =
-     "osf_namespace_c";
+tSCC zSolaris_Int_Limits_2Name[] =
+     "solaris_int_limits_2";
 
 /*
  *  File name selection pattern
  */
-tSCC zOsf_Namespace_CList[] =
-  "regex.h\0";
+tSCC zSolaris_Int_Limits_2List[] =
+  "sys/int_limits.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzOsf_Namespace_CMachs (const char**)NULL
+tSCC* apzSolaris_Int_Limits_2Machs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zOsf_Namespace_CSelect0[] =
-       "#include <reg_types.h>.*";
-
-/*
- *  perform the 'test' shell command - do fix on success
- */
-tSCC zOsf_Namespace_CTest0[] =
-       " -r reg_types.h";
-tSCC zOsf_Namespace_CTest1[] =
-       " -r sys/lc_core.h";
-tSCC zOsf_Namespace_CTest2[] =
-       " -n \"`grep '} regex_t;' reg_types.h`\"";
-tSCC zOsf_Namespace_CTest3[] =
-       " -z \"`grep __regex_t regex.h`\"";
+tSCC zSolaris_Int_Limits_2Select0[] =
+       "^#define[ \t]+(INT|UINT)_FAST16_(MAX|MIN)[ \t](INT|UINT)16.*";
 
-#define    OSF_NAMESPACE_C_TEST_CT  5
-static tTestDesc aOsf_Namespace_CTests[] = {
-  { TT_TEST,     zOsf_Namespace_CTest0,   0 /* unused */ },
-  { TT_TEST,     zOsf_Namespace_CTest1,   0 /* unused */ },
-  { TT_TEST,     zOsf_Namespace_CTest2,   0 /* unused */ },
-  { TT_TEST,     zOsf_Namespace_CTest3,   0 /* unused */ },
-  { TT_EGREP,    zOsf_Namespace_CSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_INT_LIMITS_2_TEST_CT  1
+static tTestDesc aSolaris_Int_Limits_2Tests[] = {
+  { TT_EGREP,    zSolaris_Int_Limits_2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Osf_Namespace_C
+ *  Fix Command Arguments for Solaris_Int_Limits_2
  */
-static const char* apzOsf_Namespace_CPatch[] = {
+static const char* apzSolaris_Int_Limits_2Patch[] = {
     "format",
-    "%0\n\
-typedef __regex_t\tregex_t;\n\
-typedef __regoff_t\tregoff_t;\n\
-typedef __regmatch_t\tregmatch_t;",
+    "#define\t%1_FAST16_%2 %132_%2",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Pthread_Incomplete_Struct_Argument fix
+ *  Description of Solaris_Int_Limits_3 fix
  */
-tSCC zPthread_Incomplete_Struct_ArgumentName[] =
-     "pthread_incomplete_struct_argument";
+tSCC zSolaris_Int_Limits_3Name[] =
+     "solaris_int_limits_3";
 
 /*
  *  File name selection pattern
  */
-tSCC zPthread_Incomplete_Struct_ArgumentList[] =
-  "pthread.h\0";
+tSCC zSolaris_Int_Limits_3List[] =
+  "sys/int_limits.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzPthread_Incomplete_Struct_ArgumentMachs (const char**)NULL
+tSCC* apzSolaris_Int_Limits_3Machs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zPthread_Incomplete_Struct_ArgumentSelect0[] =
-       "struct __jmp_buf_tag";
+tSCC zSolaris_Int_Limits_3Select0[] =
+       "^#define[ \t]+SIZE_MAX[ \t]+4294967295UL";
 
-#define    PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT  1
-static tTestDesc aPthread_Incomplete_Struct_ArgumentTests[] = {
-  { TT_EGREP,    zPthread_Incomplete_Struct_ArgumentSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_INT_LIMITS_3_TEST_CT  1
+static tTestDesc aSolaris_Int_Limits_3Tests[] = {
+  { TT_EGREP,    zSolaris_Int_Limits_3Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Pthread_Incomplete_Struct_Argument
+ *  Fix Command Arguments for Solaris_Int_Limits_3
  */
-static const char* apzPthread_Incomplete_Struct_ArgumentPatch[] = {
+static const char* apzSolaris_Int_Limits_3Patch[] = {
     "format",
-    "%1 *%2%3",
-    "^(extern int __sigsetjmp \\(struct __jmp_buf_tag) (__env)\\[1\\](.*)$",
+    "#define\tSIZE_MAX\t4294967295U",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Read_Ret_Type fix
+ *  Description of Solaris_Math_1 fix
  */
-tSCC zRead_Ret_TypeName[] =
-     "read_ret_type";
+tSCC zSolaris_Math_1Name[] =
+     "solaris_math_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zRead_Ret_TypeList[] =
-  "stdio.h\0";
+tSCC zSolaris_Math_1List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzRead_Ret_TypeMachs (const char**)NULL
+#define apzSolaris_Math_1Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zRead_Ret_TypeSelect0[] =
-       "extern int\t.*, fread\\(\\), fwrite\\(\\)";
+tSCC zSolaris_Math_1Select0[] =
+       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    READ_RET_TYPE_TEST_CT  1
-static tTestDesc aRead_Ret_TypeTests[] = {
-  { TT_EGREP,    zRead_Ret_TypeSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Math_1Bypass0[] =
+       "__GNUC__";
+
+#define    SOLARIS_MATH_1_TEST_CT  2
+static tTestDesc aSolaris_Math_1Tests[] = {
+  { TT_NEGREP,   zSolaris_Math_1Bypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Math_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Read_Ret_Type
+ *  Fix Command Arguments for Solaris_Math_1
  */
-static const char* apzRead_Ret_TypePatch[] = {
+static const char* apzSolaris_Math_1Patch[] = {
     "format",
-    "extern unsigned int fread(), fwrite();\n\
-%1%2",
-    "(extern int\t.*), fread\\(\\), fwrite\\(\\)(.*)",
+    "#define\tHUGE_VA%1\t(__builtin_huge_va%2())",
+    "^#define[ \t]+HUGE_VA([LF]+)[ \t]+__builtin_huge_va([lf]+)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Rpc_Xdr_Lvalue_Cast_A fix
+ *  Description of Solaris_Math_10 fix
  */
-tSCC zRpc_Xdr_Lvalue_Cast_AName[] =
-     "rpc_xdr_lvalue_cast_a";
+tSCC zSolaris_Math_10Name[] =
+     "solaris_math_10";
 
 /*
  *  File name selection pattern
  */
-tSCC zRpc_Xdr_Lvalue_Cast_AList[] =
-  "rpc/xdr.h\0";
+tSCC zSolaris_Math_10List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzRpc_Xdr_Lvalue_Cast_AMachs (const char**)NULL
+#define apzSolaris_Math_10Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zRpc_Xdr_Lvalue_Cast_ASelect0[] =
-       "#define[ \t]*IXDR_GET_LONG.*\\\\\n\
-.*__extension__.*";
+tSCC zSolaris_Math_10Select0[] =
+       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    RPC_XDR_LVALUE_CAST_A_TEST_CT  1
-static tTestDesc aRpc_Xdr_Lvalue_Cast_ATests[] = {
-  { TT_EGREP,    zRpc_Xdr_Lvalue_Cast_ASelect0, (regex_t*)NULL }, };
+#define    SOLARIS_MATH_10_TEST_CT  1
+static tTestDesc aSolaris_Math_10Tests[] = {
+  { TT_EGREP,    zSolaris_Math_10Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Rpc_Xdr_Lvalue_Cast_A
+ *  Fix Command Arguments for Solaris_Math_10
  */
-static const char* apzRpc_Xdr_Lvalue_Cast_APatch[] = {
+static const char* apzSolaris_Math_10Patch[] = {
     "format",
-    "#define IXDR_GET_LONG(buf) ((long)IXDR_GET_U_INT32(buf))",
+    "#define\tisinf(x) __builtin_isinf(x)",
+    "^#define[ \t]+isinf\\(x\\)[ \t]+__extension__\\([ \t]*\\\\\n\
+[ \t]*\\{[ \t]*__typeof\\(x\\)[ \t]*__x_i[ \t]*=[ \t]*\\(x\\);[ \t]*\\\\\n\
+[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*INFINITY[ \t]*\\|\\|[ \t]*\\\\\n\
+[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*\\(-INFINITY\\);[ \t]*\\}\\)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Rpc_Xdr_Lvalue_Cast_B fix
+ *  Description of Solaris_Math_2 fix
  */
-tSCC zRpc_Xdr_Lvalue_Cast_BName[] =
-     "rpc_xdr_lvalue_cast_b";
+tSCC zSolaris_Math_2Name[] =
+     "solaris_math_2";
 
 /*
  *  File name selection pattern
  */
-tSCC zRpc_Xdr_Lvalue_Cast_BList[] =
-  "rpc/xdr.h\0";
+tSCC zSolaris_Math_2List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzRpc_Xdr_Lvalue_Cast_BMachs (const char**)NULL
+#define apzSolaris_Math_2Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zRpc_Xdr_Lvalue_Cast_BSelect0[] =
-       "#define[ \t]*IXDR_PUT_LONG.*\\\\\n\
-.*__extension__.*";
+tSCC zSolaris_Math_2Select0[] =
+       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    RPC_XDR_LVALUE_CAST_B_TEST_CT  1
-static tTestDesc aRpc_Xdr_Lvalue_Cast_BTests[] = {
-  { TT_EGREP,    zRpc_Xdr_Lvalue_Cast_BSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Math_2Bypass0[] =
+       "__GNUC__";
+
+#define    SOLARIS_MATH_2_TEST_CT  2
+static tTestDesc aSolaris_Math_2Tests[] = {
+  { TT_NEGREP,   zSolaris_Math_2Bypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Math_2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Rpc_Xdr_Lvalue_Cast_B
+ *  Fix Command Arguments for Solaris_Math_2
  */
-static const char* apzRpc_Xdr_Lvalue_Cast_BPatch[] = {
+static const char* apzSolaris_Math_2Patch[] = {
     "format",
-    "#define IXDR_PUT_LONG(buf, v) ((long)IXDR_PUT_INT32(buf, (long)(v)))",
+    "#define\tINFINITY\t(__builtin_inff())",
+    "^#define[ \t]+INFINITY[ \t]+__builtin_infinity",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Rs6000_Double fix
+ *  Description of Solaris_Math_3 fix
  */
-tSCC zRs6000_DoubleName[] =
-     "rs6000_double";
+tSCC zSolaris_Math_3Name[] =
+     "solaris_math_3";
 
 /*
  *  File name selection pattern
  */
-tSCC zRs6000_DoubleList[] =
-  "math.h\0";
+tSCC zSolaris_Math_3List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzRs6000_DoubleMachs (const char**)NULL
+#define apzSolaris_Math_3Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zRs6000_DoubleSelect0[] =
-       "[^a-zA-Z_]class\\(";
+tSCC zSolaris_Math_3Select0[] =
+       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    RS6000_DOUBLE_TEST_CT  1
-static tTestDesc aRs6000_DoubleTests[] = {
-  { TT_EGREP,    zRs6000_DoubleSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Math_3Bypass0[] =
+       "__GNUC__";
+
+#define    SOLARIS_MATH_3_TEST_CT  2
+static tTestDesc aSolaris_Math_3Tests[] = {
+  { TT_NEGREP,   zSolaris_Math_3Bypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Math_3Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Rs6000_Double
+ *  Fix Command Arguments for Solaris_Math_3
  */
-static const char* apzRs6000_DoublePatch[] = {
+static const char* apzSolaris_Math_3Patch[] = {
     "format",
-    "#ifndef __cplusplus\n\
-%0\n\
-#endif",
-    "^.*[^a-zA-Z_]class\\(.*",
+    "#define\tNAN\t\t(__builtin_nanf(\"\"))",
+    "^#define[ \t]+NAN[ \t]+__builtin_nan",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Rs6000_Fchmod fix
+ *  Description of Solaris_Math_4 fix
  */
-tSCC zRs6000_FchmodName[] =
-     "rs6000_fchmod";
+tSCC zSolaris_Math_4Name[] =
+     "solaris_math_4";
 
 /*
  *  File name selection pattern
  */
-tSCC zRs6000_FchmodList[] =
-  "sys/stat.h\0";
+tSCC zSolaris_Math_4List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzRs6000_FchmodMachs (const char**)NULL
+#define apzSolaris_Math_4Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zRs6000_FchmodSelect0[] =
-       "fchmod\\(char \\*";
+tSCC zSolaris_Math_4Select0[] =
+       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    RS6000_FCHMOD_TEST_CT  1
-static tTestDesc aRs6000_FchmodTests[] = {
-  { TT_EGREP,    zRs6000_FchmodSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Math_4Bypass0[] =
+       "__GNUC__";
+
+#define    SOLARIS_MATH_4_TEST_CT  2
+static tTestDesc aSolaris_Math_4Tests[] = {
+  { TT_NEGREP,   zSolaris_Math_4Bypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Math_4Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Rs6000_Fchmod
+ *  Fix Command Arguments for Solaris_Math_4
  */
-static const char* apzRs6000_FchmodPatch[] = {
+static const char* apzSolaris_Math_4Patch[] = {
     "format",
-    "fchmod(int",
+    "#define\tfpclassify(x) \\\n\
+  __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL, FP_SUBNORMAL, FP_ZERO, (x))",
+    "^#define[ \t]+fpclassify\\(x\\)[ \t]+__builtin_fpclassify\\(x\\)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Rs6000_Param fix
+ *  Description of Solaris_Math_8 fix
  */
-tSCC zRs6000_ParamName[] =
-     "rs6000_param";
+tSCC zSolaris_Math_8Name[] =
+     "solaris_math_8";
 
 /*
  *  File name selection pattern
  */
-tSCC zRs6000_ParamList[] =
-  "stdio.h\0unistd.h\0";
+tSCC zSolaris_Math_8List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzRs6000_ParamMachs (const char**)NULL
+#define apzSolaris_Math_8Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zRs6000_ParamSelect0[] =
-       "rename\\(const char \\*old, const char \\*new\\)";
+tSCC zSolaris_Math_8Select0[] =
+       "@\\(#\\)math_c99\\.h[ \t]+1\\.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    RS6000_PARAM_TEST_CT  1
-static tTestDesc aRs6000_ParamTests[] = {
-  { TT_EGREP,    zRs6000_ParamSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Math_8Bypass0[] =
+       "__GNUC__";
+
+#define    SOLARIS_MATH_8_TEST_CT  2
+static tTestDesc aSolaris_Math_8Tests[] = {
+  { TT_NEGREP,   zSolaris_Math_8Bypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Math_8Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Rs6000_Param
+ *  Fix Command Arguments for Solaris_Math_8
  */
-static const char* apzRs6000_ParamPatch[] = {
+static const char* apzSolaris_Math_8Patch[] = {
     "format",
-    "rename(const char *_old, const char *_new)",
+    "#define\tsignbit(x)\t(sizeof(x) == sizeof(float) \\\n\
+\t\t\t   ? __builtin_signbitf(x) \\\n\
+\t\t\t   : sizeof(x) == sizeof(long double) \\\n\
+\t\t\t     ? __builtin_signbitl(x) \\\n\
+\t\t\t     : __builtin_signbit(x))",
+    "^#define[ \t]+signbit\\(x\\)[ \t]+__builtin_signbit\\(x\\)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris___Restrict fix
+ *  Description of Solaris_Math_9 fix
  */
-tSCC zSolaris___RestrictName[] =
-     "solaris___restrict";
+tSCC zSolaris_Math_9Name[] =
+     "solaris_math_9";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris___RestrictList[] =
-  "sys/feature_tests.h\0";
+tSCC zSolaris_Math_9List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris___RestrictMachs[] = {
-        "*-*-solaris2*",
-        (const char*)NULL };
+#define apzSolaris_Math_9Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris___RestrictSelect0[] =
-       "#define[ \t]*_RESTRICT_KYWD[ \t]*restrict";
+tSCC zSolaris_Math_9Select0[] =
+       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    SOLARIS___RESTRICT_TEST_CT  1
-static tTestDesc aSolaris___RestrictTests[] = {
-  { TT_EGREP,    zSolaris___RestrictSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Math_9Bypass0[] =
+       "__GNUC__";
+
+#define    SOLARIS_MATH_9_TEST_CT  2
+static tTestDesc aSolaris_Math_9Tests[] = {
+  { TT_NEGREP,   zSolaris_Math_9Bypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Math_9Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris___Restrict
+ *  Fix Command Arguments for Solaris_Math_9
  */
-static const char* apzSolaris___RestrictPatch[] = {
+static const char* apzSolaris_Math_9Patch[] = {
     "format",
-    "#ifdef __cplusplus\n\
-#define\t_RESTRICT_KYWD\t__restrict\n\
-#else\n\
-%0\n\
-#endif",
+    "#define\t%1(x, y)%2__builtin_%1(x, y)",
+    "^#define[ \t]+([a-z]+)\\(x, y\\)([ \t]+)\\(\\(x\\) __builtin_[a-z]+\\(y\\)\\)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Complex fix
+ *  Description of Solaris_Math_11 fix
  */
-tSCC zSolaris_ComplexName[] =
-     "solaris_complex";
+tSCC zSolaris_Math_11Name[] =
+     "solaris_math_11";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_ComplexList[] =
-  "complex.h\0";
+tSCC zSolaris_Math_11List[] =
+  "iso/math_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_ComplexMachs[] = {
-        "*-*-solaris2.*",
-        (const char*)NULL };
+#define apzSolaris_Math_11Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_ComplexSelect0[] =
-       "#define[ \t]_Complex_I[ \t]_Complex_I";
+tSCC zSolaris_Math_11Select0[] =
+       "@\\(#\\)math_c99\\.h[ \t]+1\\.[0-9]+[ \t]+[0-9/]+ ";
 
-#define    SOLARIS_COMPLEX_TEST_CT  1
-static tTestDesc aSolaris_ComplexTests[] = {
-  { TT_EGREP,    zSolaris_ComplexSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_MATH_11_TEST_CT  1
+static tTestDesc aSolaris_Math_11Tests[] = {
+  { TT_EGREP,    zSolaris_Math_11Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Complex
+ *  Fix Command Arguments for Solaris_Math_11
  */
-static const char* apzSolaris_ComplexPatch[] = { sed_cmd_z,
-    "-e", "s/#define[ \t]_Complex_I[ \t]_Complex_I/#define\t_Complex_I\t(__extension__ 1.0iF)/",
-    "-e", "/#define[ \t]_Imaginary_I[ \t]_Imaginary_I/d",
-    "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d",
-    "-e", "s/#define[ \t]I[ \t]\\{1,\\}_Imaginary_I/#define\tI\t\t_Complex_I/",
+static const char* apzSolaris_Math_11Patch[] = {
+    "format",
+    "#undef\tsignbit\n\
+#define\tsignbit(x)\t(sizeof(x) == sizeof(float) \\\n\
+\t\t\t   ? __builtin_signbitf(x) \\\n\
+\t\t\t   : sizeof(x) == sizeof(long double) \\\n\
+\t\t\t     ? __builtin_signbitl(x) \\\n\
+\t\t\t     : __builtin_signbit(x))",
+    "^#undef[ \t]+signbit\n\
+#if defined\\(__sparc\\)\n\
+#define[ \t]+signbit\\(x\\)[ \t]+__extension__\\( \\\\\n\
+[ \t]+\\{[ \t]*__typeof\\(x\\)[ \t]*__x_s[ \t]*=[ \t]*\\(x\\);[ \t]*\\\\\n\
+[ \t]+\\(int\\)[ \t]*\\(\\*\\(unsigned[ \t]*\\*\\)[ \t]*\\&__x_s[ \t]*>>[ \t]*31\\);[ \t]*\\}\\)\n\
+#elif defined\\(__i386\\) \\|\\| defined\\(__amd64\\)\n\
+#define[ \t]+signbit\\(x\\)[ \t]+__extension__\\( \\\\\n\
+[ \t]+\\{ __typeof\\(x\\) __x_s = \\(x\\); \\\\\n\
+[ \t]+\\(sizeof \\(__x_s\\) == sizeof \\(float\\) \\? \\\\\n\
+[ \t]+\\(int\\) \\(\\*\\(unsigned \\*\\) \\&__x_s >> 31\\) : \\\\\n\
+[ \t]+sizeof \\(__x_s\\) == sizeof \\(double\\) \\? \\\\\n\
+[ \t]+\\(int\\) \\(\\(\\(unsigned \\*\\) \\&__x_s\\)\\[1\\] >> 31\\) : \\\\\n\
+[ \t]+\\(int\\) \\(\\(\\(unsigned short \\*\\) \\&__x_s\\)\\[4\\] >> 15\\)\\); \\}\\)\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Complex_Cxx fix
+ *  Description of Solaris_Math_12 fix
  */
-tSCC zSolaris_Complex_CxxName[] =
-     "solaris_complex_cxx";
+tSCC zSolaris_Math_12Name[] =
+     "solaris_math_12";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Complex_CxxList[] =
-  "complex.h\0";
+tSCC zSolaris_Math_12List[] =
+  "math.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Complex_CxxMachs[] = {
-        "*-*-solaris2.*",
+tSCC* apzSolaris_Math_12Machs[] = {
+        "*-*-solaris2*",
         (const char*)NULL };
-#define SOLARIS_COMPLEX_CXX_TEST_CT  0
-#define aSolaris_Complex_CxxTests   (tTestDesc*)NULL
 
 /*
- *  Fix Command Arguments for Solaris_Complex_Cxx
+ *  content selection pattern - do fix if pattern found
  */
-static const char* apzSolaris_Complex_CxxPatch[] = { sed_cmd_z,
-    "-e", "/#if[ \t]*!defined(__cplusplus)/c#ifdef\t__cplusplus\\\n\
-extern \"C\" {\\\n\
-#endif",
-    "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c#ifdef\t__cplusplus\\\n\
-}\\\n\
-#endif",
+tSCC zSolaris_Math_12Select0[] =
+       "#undef.*_GLIBCXX_USE_C99_MATH";
+
+#define    SOLARIS_MATH_12_TEST_CT  1
+static tTestDesc aSolaris_Math_12Tests[] = {
+  { TT_EGREP,    zSolaris_Math_12Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Solaris_Math_12
+ */
+static const char* apzSolaris_Math_12Patch[] = { sed_cmd_z,
+    "-e", "/#undef[ \t]*_GLIBCXX_USE_C99_MATH/d",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Cond_Init fix
+ *  Description of Solaris_Once_Init_1 fix
  */
-tSCC zSolaris_Cond_InitName[] =
-     "solaris_cond_init";
+tSCC zSolaris_Once_Init_1Name[] =
+     "solaris_once_init_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Cond_InitList[] =
+tSCC zSolaris_Once_Init_1List[] =
   "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Cond_InitMachs[] = {
-        "*-*-solaris2.8",
+tSCC* apzSolaris_Once_Init_1Machs[] = {
+        "*-*-solaris*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Cond_InitSelect0[] =
+tSCC zSolaris_Once_Init_1Select0[] =
        "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    SOLARIS_COND_INIT_TEST_CT  1
-static tTestDesc aSolaris_Cond_InitTests[] = {
-  { TT_EGREP,    zSolaris_Cond_InitSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_ONCE_INIT_1_TEST_CT  1
+static tTestDesc aSolaris_Once_Init_1Tests[] = {
+  { TT_EGREP,    zSolaris_Once_Init_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Cond_Init
+ *  Fix Command Arguments for Solaris_Once_Init_1
  */
-static const char* apzSolaris_Cond_InitPatch[] = {
+static const char* apzSolaris_Once_Init_1Patch[] = {
     "format",
-    "%1, 0x4356%2",
-    "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+\\{.*0)(\\},[ \t]*0\\}.*)$",
+    "%1{%2}%3",
+    "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{)([^}]+)(\\})[ \t]*$",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Math_1 fix
+ *  Description of Solaris_Posix_Spawn_Restrict fix
  */
-tSCC zSolaris_Math_1Name[] =
-     "solaris_math_1";
+tSCC zSolaris_Posix_Spawn_RestrictName[] =
+     "solaris_posix_spawn_restrict";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Math_1List[] =
-  "iso/math_c99.h\0";
+tSCC zSolaris_Posix_Spawn_RestrictList[] =
+  "spawn.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Math_1Machs (const char**)NULL
+tSCC* apzSolaris_Posix_Spawn_RestrictMachs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Math_1Select0[] =
-       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Math_1Bypass0[] =
-       "__GNUC__";
+tSCC zSolaris_Posix_Spawn_RestrictSelect0[] =
+       "(.*[ \t]+)([a-z]+)\\[_RESTRICT_KYWD\\](.*)";
 
-#define    SOLARIS_MATH_1_TEST_CT  2
-static tTestDesc aSolaris_Math_1Tests[] = {
-  { TT_NEGREP,   zSolaris_Math_1Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Math_1Select0, (regex_t*)NULL }, };
+#define    SOLARIS_POSIX_SPAWN_RESTRICT_TEST_CT  1
+static tTestDesc aSolaris_Posix_Spawn_RestrictTests[] = {
+  { TT_EGREP,    zSolaris_Posix_Spawn_RestrictSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Math_1
+ *  Fix Command Arguments for Solaris_Posix_Spawn_Restrict
  */
-static const char* apzSolaris_Math_1Patch[] = {
+static const char* apzSolaris_Posix_Spawn_RestrictPatch[] = {
     "format",
-    "#define\tHUGE_VA%1\t(__builtin_huge_va%2())",
-    "^#define[ \t]+HUGE_VA([LF]+)[ \t]+__builtin_huge_va([lf]+)",
+    "%1*_RESTRICT_KYWD %2%3",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Math_2 fix
+ *  Description of Solaris_Pow_Int_Overload fix
  */
-tSCC zSolaris_Math_2Name[] =
-     "solaris_math_2";
+tSCC zSolaris_Pow_Int_OverloadName[] =
+     "solaris_pow_int_overload";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Math_2List[] =
-  "iso/math_c99.h\0";
+tSCC zSolaris_Pow_Int_OverloadList[] =
+  "iso/math_iso.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Math_2Machs (const char**)NULL
+tSCC* apzSolaris_Pow_Int_OverloadMachs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Math_2Select0[] =
-       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Math_2Bypass0[] =
-       "__GNUC__";
+tSCC zSolaris_Pow_Int_OverloadSelect0[] =
+       "^[ \t]*inline [a-z ]* pow\\([^()]*, int [^()]*\\) *\\{[^{}]*\n\
+[^{}]*\\}";
 
-#define    SOLARIS_MATH_2_TEST_CT  2
-static tTestDesc aSolaris_Math_2Tests[] = {
-  { TT_NEGREP,   zSolaris_Math_2Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Math_2Select0, (regex_t*)NULL }, };
+#define    SOLARIS_POW_INT_OVERLOAD_TEST_CT  1
+static tTestDesc aSolaris_Pow_Int_OverloadTests[] = {
+  { TT_EGREP,    zSolaris_Pow_Int_OverloadSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Math_2
+ *  Fix Command Arguments for Solaris_Pow_Int_Overload
  */
-static const char* apzSolaris_Math_2Patch[] = {
+static const char* apzSolaris_Pow_Int_OverloadPatch[] = {
     "format",
-    "#define\tINFINITY\t(__builtin_inff())",
-    "^#define[ \t]+INFINITY[ \t]+__builtin_infinity",
+    "#if __cplusplus < 201103L\n\
+%0\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Math_3 fix
+ *  Description of Solaris_Rwlock_Init_1 fix
  */
-tSCC zSolaris_Math_3Name[] =
-     "solaris_math_3";
+tSCC zSolaris_Rwlock_Init_1Name[] =
+     "solaris_rwlock_init_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Math_3List[] =
-  "iso/math_c99.h\0";
+tSCC zSolaris_Rwlock_Init_1List[] =
+  "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Math_3Machs (const char**)NULL
+tSCC* apzSolaris_Rwlock_Init_1Machs[] = {
+        "*-*-solaris*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Math_3Select0[] =
-       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Math_3Bypass0[] =
-       "__GNUC__";
+tSCC zSolaris_Rwlock_Init_1Select0[] =
+       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    SOLARIS_MATH_3_TEST_CT  2
-static tTestDesc aSolaris_Math_3Tests[] = {
-  { TT_NEGREP,   zSolaris_Math_3Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Math_3Select0, (regex_t*)NULL }, };
+#define    SOLARIS_RWLOCK_INIT_1_TEST_CT  1
+static tTestDesc aSolaris_Rwlock_Init_1Tests[] = {
+  { TT_EGREP,    zSolaris_Rwlock_Init_1Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Math_3
+ *  Fix Command Arguments for Solaris_Rwlock_Init_1
  */
-static const char* apzSolaris_Math_3Patch[] = {
+static const char* apzSolaris_Rwlock_Init_1Patch[] = {
     "format",
-    "#define\tNAN\t\t(__builtin_nanf(\"\"))",
-    "^#define[ \t]+NAN[ \t]+__builtin_nan",
+    "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
+%0\n\
+#else\n\
+%1{0, 0, 0, {{0}, {0}, {0}}, {{0}, {0}}, {{0}, {0}}}\n\
+#endif",
+    "(^#define[ \t]+PTHREAD_RWLOCK_INITIALIZER[ \t]+)\\{0, 0, 0, \\{0, 0, 0\\}, \\{0, 0\\}, \\{0, 0\\}\\}[ \t]*$",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Math_4 fix
+ *  Description of Solaris_Std___Filbuf fix
  */
-tSCC zSolaris_Math_4Name[] =
-     "solaris_math_4";
+tSCC zSolaris_Std___FilbufName[] =
+     "solaris_std___filbuf";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Math_4List[] =
-  "iso/math_c99.h\0";
+tSCC zSolaris_Std___FilbufList[] =
+  "stdio.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Math_4Machs (const char**)NULL
+tSCC* apzSolaris_Std___FilbufMachs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Math_4Select0[] =
-       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zSolaris_Std___FilbufSelect0[] =
+       "(using std::perror;\n\
+)(#endif)";
 
 /*
  *  content bypass pattern - skip fix if pattern found
  */
-tSCC zSolaris_Math_4Bypass0[] =
-       "__GNUC__";
+tSCC zSolaris_Std___FilbufBypass0[] =
+       "using std::__filbuf";
 
-#define    SOLARIS_MATH_4_TEST_CT  2
-static tTestDesc aSolaris_Math_4Tests[] = {
-  { TT_NEGREP,   zSolaris_Math_4Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Math_4Select0, (regex_t*)NULL }, };
+#define    SOLARIS_STD___FILBUF_TEST_CT  2
+static tTestDesc aSolaris_Std___FilbufTests[] = {
+  { TT_NEGREP,   zSolaris_Std___FilbufBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Std___FilbufSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Math_4
+ *  Fix Command Arguments for Solaris_Std___Filbuf
  */
-static const char* apzSolaris_Math_4Patch[] = {
+static const char* apzSolaris_Std___FilbufPatch[] = {
     "format",
-    "#define\tfpclassify(x) \\\n\
-  __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL, FP_SUBNORMAL, FP_ZERO, (x))",
-    "^#define[ \t]+fpclassify\\(x\\)[ \t]+__builtin_fpclassify\\(x\\)",
+    "%1#ifndef _LP64\n\
+using std::__filbuf;\n\
+using std::__flsbuf;\n\
+#endif\n\
+%2",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Math_8 fix
+ *  Description of Solaris_Std_Gets_Cxx14 fix
  */
-tSCC zSolaris_Math_8Name[] =
-     "solaris_math_8";
+tSCC zSolaris_Std_Gets_Cxx14Name[] =
+     "solaris_std_gets_cxx14";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Math_8List[] =
-  "iso/math_c99.h\0";
+tSCC zSolaris_Std_Gets_Cxx14List[] =
+  "stdio.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Math_8Machs (const char**)NULL
+tSCC* apzSolaris_Std_Gets_Cxx14Machs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Math_8Select0[] =
-       "@\\(#\\)math_c99\\.h[ \t]+1\\.[0-9]+[ \t]+[0-9/]+ SMI";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Math_8Bypass0[] =
-       "__GNUC__";
+tSCC zSolaris_Std_Gets_Cxx14Select0[] =
+       "using std::gets;";
 
-#define    SOLARIS_MATH_8_TEST_CT  2
-static tTestDesc aSolaris_Math_8Tests[] = {
-  { TT_NEGREP,   zSolaris_Math_8Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Math_8Select0, (regex_t*)NULL }, };
+#define    SOLARIS_STD_GETS_CXX14_TEST_CT  1
+static tTestDesc aSolaris_Std_Gets_Cxx14Tests[] = {
+  { TT_EGREP,    zSolaris_Std_Gets_Cxx14Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Math_8
+ *  Fix Command Arguments for Solaris_Std_Gets_Cxx14
  */
-static const char* apzSolaris_Math_8Patch[] = {
+static const char* apzSolaris_Std_Gets_Cxx14Patch[] = {
     "format",
-    "#define\tsignbit(x)\t(sizeof(x) == sizeof(float) \\\n\
-\t\t\t   ? __builtin_signbitf(x) \\\n\
-\t\t\t   : sizeof(x) == sizeof(long double) \\\n\
-\t\t\t     ? __builtin_signbitl(x) \\\n\
-\t\t\t     : __builtin_signbit(x))",
-    "^#define[ \t]+signbit\\(x\\)[ \t]+__builtin_signbit\\(x\\)",
+    "#if __cplusplus < 201402L\n\
+%0\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Math_9 fix
+ *  Description of Solaris_Stdio_Tag fix
  */
-tSCC zSolaris_Math_9Name[] =
-     "solaris_math_9";
+tSCC zSolaris_Stdio_TagName[] =
+     "solaris_stdio_tag";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Math_9List[] =
-  "iso/math_c99.h\0";
+tSCC zSolaris_Stdio_TagList[] =
+  "stdio_tag.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Math_9Machs (const char**)NULL
+#define apzSolaris_Stdio_TagMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Math_9Select0[] =
-       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zSolaris_Stdio_TagSelect0[] =
+       "__cplusplus < 54321L";
 
 /*
  *  content bypass pattern - skip fix if pattern found
  */
-tSCC zSolaris_Math_9Bypass0[] =
+tSCC zSolaris_Stdio_TagBypass0[] =
        "__GNUC__";
 
-#define    SOLARIS_MATH_9_TEST_CT  2
-static tTestDesc aSolaris_Math_9Tests[] = {
-  { TT_NEGREP,   zSolaris_Math_9Bypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Math_9Select0, (regex_t*)NULL }, };
+#define    SOLARIS_STDIO_TAG_TEST_CT  2
+static tTestDesc aSolaris_Stdio_TagTests[] = {
+  { TT_NEGREP,   zSolaris_Stdio_TagBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Stdio_TagSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Math_9
+ *  Fix Command Arguments for Solaris_Stdio_Tag
  */
-static const char* apzSolaris_Math_9Patch[] = {
-    "format",
-    "#define\t%1(x, y)%2__builtin_%1(x, y)",
-    "^#define[ \t]+([a-z]+)\\(x, y\\)([ \t]+)\\(\\(x\\) __builtin_[a-z]+\\(y\\)\\)",
+static const char* apzSolaris_Stdio_TagPatch[] = { sed_cmd_z,
+    "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Math_10 fix
+ *  Description of Solaris_Stdlib_Noreturn fix
  */
-tSCC zSolaris_Math_10Name[] =
-     "solaris_math_10";
+tSCC zSolaris_Stdlib_NoreturnName[] =
+     "solaris_stdlib_noreturn";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Math_10List[] =
-  "iso/math_c99.h\0";
+tSCC zSolaris_Stdlib_NoreturnList[] =
+  "iso/stdlib_c99.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Math_10Machs (const char**)NULL
+tSCC* apzSolaris_Stdlib_NoreturnMachs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Math_10Select0[] =
-       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zSolaris_Stdlib_NoreturnSelect0[] =
+       "(extern) _Noreturn (void quick_exit\\(int\\));";
 
-#define    SOLARIS_MATH_10_TEST_CT  1
-static tTestDesc aSolaris_Math_10Tests[] = {
-  { TT_EGREP,    zSolaris_Math_10Select0, (regex_t*)NULL }, };
+#define    SOLARIS_STDLIB_NORETURN_TEST_CT  1
+static tTestDesc aSolaris_Stdlib_NoreturnTests[] = {
+  { TT_EGREP,    zSolaris_Stdlib_NoreturnSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Math_10
+ *  Fix Command Arguments for Solaris_Stdlib_Noreturn
  */
-static const char* apzSolaris_Math_10Patch[] = {
+static const char* apzSolaris_Stdlib_NoreturnPatch[] = {
     "format",
-    "#define\tisinf(x) __builtin_isinf(x)",
-    "^#define[ \t]+isinf\\(x\\)[ \t]+__extension__\\([ \t]*\\\\\n\
-[ \t]*\\{[ \t]*__typeof\\(x\\)[ \t]*__x_i[ \t]*=[ \t]*\\(x\\);[ \t]*\\\\\n\
-[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*INFINITY[ \t]*\\|\\|[ \t]*\\\\\n\
-[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*\\(-INFINITY\\);[ \t]*\\}\\)",
+    "%1 %2 __attribute__((__noreturn__));",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Mutex_Init_2 fix
+ *  Description of Statsswtch fix
  */
-tSCC zSolaris_Mutex_Init_2Name[] =
-     "solaris_mutex_init_2";
+tSCC zStatsswtchName[] =
+     "statsswtch";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Mutex_Init_2List[] =
-  "pthread.h\0";
+tSCC zStatsswtchList[] =
+  "rpcsvc/rstat.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Mutex_Init_2Machs[] = {
-        "*-*-solaris2.[0-9]",
-        "*-*-solaris2.[0-9][!0-9]*",
-        (const char*)NULL };
+#define apzStatsswtchMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Mutex_Init_2Select0[] =
-       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zStatsswtchSelect0[] =
+       "boottime$";
 
-#define    SOLARIS_MUTEX_INIT_2_TEST_CT  1
-static tTestDesc aSolaris_Mutex_Init_2Tests[] = {
-  { TT_EGREP,    zSolaris_Mutex_Init_2Select0, (regex_t*)NULL }, };
+#define    STATSSWTCH_TEST_CT  1
+static tTestDesc aStatsswtchTests[] = {
+  { TT_EGREP,    zStatsswtchSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Mutex_Init_2
+ *  Fix Command Arguments for Statsswtch
  */
-static const char* apzSolaris_Mutex_Init_2Patch[] = {
+static const char* apzStatsswtchPatch[] = {
     "format",
-    "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
-%0\n\
-#else\n\
-%1, {0}}%4\n\
-#endif",
-    "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+(|/*.**/[ \t]*\\\\\n\
-[ \t]*)\\{.*),[ \t]*0\\}(|[ \t].*)$",
+    "boottime;",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Rwlock_Init_1 fix
+ *  Description of Stdio_Stdarg_H fix
  */
-tSCC zSolaris_Rwlock_Init_1Name[] =
-     "solaris_rwlock_init_1";
+tSCC zStdio_Stdarg_HName[] =
+     "stdio_stdarg_h";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Rwlock_Init_1List[] =
-  "pthread.h\0";
+tSCC zStdio_Stdarg_HList[] =
+  "stdio.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Rwlock_Init_1Machs[] = {
-        "*-*-solaris*",
+tSCC* apzStdio_Stdarg_HMachs[] = {
+        "*-*-solaris2.1[0-9]*",
         (const char*)NULL };
 
 /*
- *  content selection pattern - do fix if pattern found
+ *  content bypass pattern - skip fix if pattern found
  */
-tSCC zSolaris_Rwlock_Init_1Select0[] =
-       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-#define    SOLARIS_RWLOCK_INIT_1_TEST_CT  1
-static tTestDesc aSolaris_Rwlock_Init_1Tests[] = {
-  { TT_EGREP,    zSolaris_Rwlock_Init_1Select0, (regex_t*)NULL }, };
+tSCC zStdio_Stdarg_HBypass0[] =
+       "include.*(stdarg.h|machine/ansi.h)";
 
-/*
- *  Fix Command Arguments for Solaris_Rwlock_Init_1
- */
-static const char* apzSolaris_Rwlock_Init_1Patch[] = {
-    "format",
-    "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
-%0\n\
-#else\n\
-%1{0, 0, 0, {{0}, {0}, {0}}, {{0}, {0}}, {{0}, {0}}}\n\
-#endif",
-    "(^#define[ \t]+PTHREAD_RWLOCK_INITIALIZER[ \t]+)\\{0, 0, 0, \\{0, 0, 0\\}, \\{0, 0\\}, \\{0, 0\\}\\}[ \t]*$",
+#define    STDIO_STDARG_H_TEST_CT  1
+static tTestDesc aStdio_Stdarg_HTests[] = {
+  { TT_NEGREP,   zStdio_Stdarg_HBypass0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Stdio_Stdarg_H
+ */
+static const char* apzStdio_Stdarg_HPatch[] = {
+    "wrap",
+    "#define __need___va_list\n\
+#include <stdarg.h>\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Once_Init_1 fix
+ *  Description of Stdio_Va_List fix
  */
-tSCC zSolaris_Once_Init_1Name[] =
-     "solaris_once_init_1";
+tSCC zStdio_Va_ListName[] =
+     "stdio_va_list";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Once_Init_1List[] =
-  "pthread.h\0";
+tSCC zStdio_Va_ListList[] =
+  "stdio.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Once_Init_1Machs[] = {
-        "*-*-solaris*",
+tSCC* apzStdio_Va_ListMachs[] = {
+        "*-*-solaris2.1[0-9]*",
         (const char*)NULL };
 
 /*
- *  content selection pattern - do fix if pattern found
+ *  content bypass pattern - skip fix if pattern found
  */
-tSCC zSolaris_Once_Init_1Select0[] =
-       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zStdio_Va_ListBypass0[] =
+       "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list";
 
-#define    SOLARIS_ONCE_INIT_1_TEST_CT  1
-static tTestDesc aSolaris_Once_Init_1Tests[] = {
-  { TT_EGREP,    zSolaris_Once_Init_1Select0, (regex_t*)NULL }, };
+#define    STDIO_VA_LIST_TEST_CT  1
+static tTestDesc aStdio_Va_ListTests[] = {
+  { TT_NEGREP,   zStdio_Va_ListBypass0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Once_Init_1
+ *  Fix Command Arguments for Stdio_Va_List
  */
-static const char* apzSolaris_Once_Init_1Patch[] = {
-    "format",
-    "%1{%2}%3",
-    "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{)([^}]+)(\\})[ \t]*$",
+static const char* apzStdio_Va_ListPatch[] = { sed_cmd_z,
+    "-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\
+s@(va_list)&@(__gnuc_va_list)\\&@\n\
+s@ _VA_LIST_));@ __gnuc_va_list));@\n\
+s@ __VA_LIST__));@ __gnuc_va_list));@\n\
+s@ va_list@ __not_va_list__@\n\
+s@\\*va_list@*__not_va_list__@\n\
+s@ __va_list)@ __gnuc_va_list)@\n\
+s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\
+s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n\
+s@GNUC_VA_LIST@GNUC_Va_LIST@\n\
+s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n\
+s@_NEED___VA_LIST@_NEED___Va_LIST@\n\
+s@VA_LIST@DUMMY_VA_LIST@\n\
+s@_Va_LIST@_VA_LIST@",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Once_Init_2 fix
+ *  Description of Stdio_Va_List_Clients fix
  */
-tSCC zSolaris_Once_Init_2Name[] =
-     "solaris_once_init_2";
+tSCC zStdio_Va_List_ClientsName[] =
+     "stdio_va_list_clients";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Once_Init_2List[] =
-  "pthread.h\0";
+tSCC zStdio_Va_List_ClientsList[] =
+  "com_err.h\0cps.h\0curses.h\0krb5.h\0lc_core.h\0pfmt.h\0wchar.h\0curses_colr/curses.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Once_Init_2Machs[] = {
-        "*-*-solaris2.[0-9]",
-        "*-*-solaris2.[0-9][!0-9]*",
-        (const char*)NULL };
+#define apzStdio_Va_List_ClientsMachs (const char**)NULL
 
 /*
- *  content selection pattern - do fix if pattern found
+ *  content bypass pattern - skip fix if pattern found
  */
-tSCC zSolaris_Once_Init_2Select0[] =
-       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+tSCC zStdio_Va_List_ClientsBypass0[] =
+       "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list";
+tSCC zStdio_Va_List_ClientsBypass1[] =
+       "include <stdarg\\.h>|#ifdef va_start";
 
-#define    SOLARIS_ONCE_INIT_2_TEST_CT  1
-static tTestDesc aSolaris_Once_Init_2Tests[] = {
-  { TT_EGREP,    zSolaris_Once_Init_2Select0, (regex_t*)NULL }, };
+#define    STDIO_VA_LIST_CLIENTS_TEST_CT  2
+static tTestDesc aStdio_Va_List_ClientsTests[] = {
+  { TT_NEGREP,   zStdio_Va_List_ClientsBypass0, (regex_t*)NULL },
+  { TT_NEGREP,   zStdio_Va_List_ClientsBypass1, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Once_Init_2
+ *  Fix Command Arguments for Stdio_Va_List_Clients
  */
-static const char* apzSolaris_Once_Init_2Patch[] = {
-    "format",
-    "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
-%0\n\
-#else\n\
-%1{0}, {0}, {0}, {%3}%4\n\
-#endif",
-    "(^#define[ \t]+PTHREAD_ONCE_INIT[ \t]+\\{\\{)(0, 0, 0, )(PTHREAD_[A-Z_]+)(\\}\\})[ \t]*$",
+static const char* apzStdio_Va_List_ClientsPatch[] = { sed_cmd_z,
+    "-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\
+s@(va_list)&@(__gnuc_va_list)\\&@\n\
+s@ _VA_LIST_));@ __gnuc_va_list));@\n\
+s@ __VA_LIST__));@ __gnuc_va_list));@\n\
+s@ va_list@ __not_va_list__@\n\
+s@\\*va_list@*__not_va_list__@\n\
+s@ __va_list)@ __gnuc_va_list)@\n\
+s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\
+s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n\
+s@GNUC_VA_LIST@GNUC_Va_LIST@\n\
+s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n\
+s@_NEED___VA_LIST@_NEED___Va_LIST@\n\
+s@VA_LIST@DUMMY_VA_LIST@\n\
+s@_Va_LIST@_VA_LIST@",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Int_Const fix
+ *  Description of Strict_Ansi_Not fix
  */
-tSCC zSolaris_Int_ConstName[] =
-     "solaris_int_const";
+tSCC zStrict_Ansi_NotName[] =
+     "strict_ansi_not";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Int_ConstList[] =
-  "sys/int_const.h\0";
+#define zStrict_Ansi_NotList (char*)NULL
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Int_ConstMachs[] = {
-        "*-*-solaris2*",
-        (const char*)NULL };
+#define apzStrict_Ansi_NotMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Int_ConstSelect0[] =
-       "^#define[ \t]+UINT8_C\\(c\\)[ \t]+__CONCAT__.*\n\
-(/*.**/)\n\
-#define[ \t]+UINT16_C\\(c\\)[ \t]+__CONCAT__.*";
+tSCC zStrict_Ansi_NotSelect0[] =
+       "^([ \t]*#[ \t]*if.*)(!__STDC__|__STDC__[ \t]*==[ \t]*0|__STDC__[ \t]*!=[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)";
 
-#define    SOLARIS_INT_CONST_TEST_CT  1
-static tTestDesc aSolaris_Int_ConstTests[] = {
-  { TT_EGREP,    zSolaris_Int_ConstSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zStrict_Ansi_NotBypass0[] =
+       "GNU and MIPS C compilers define __STDC__ differently";
+tSCC zStrict_Ansi_NotBypass1[] =
+       "__SCO_VERSION__.*__STDC__ != 1";
 
 /*
- *  Fix Command Arguments for Solaris_Int_Const
+ *  perform the C function call test
  */
-static const char* apzSolaris_Int_ConstPatch[] = {
+tSCC zStrict_Ansi_NotFTst0[] = "stdc_0_in_system_headers";
+
+#define    STRICT_ANSI_NOT_TEST_CT  4
+static tTestDesc aStrict_Ansi_NotTests[] = {
+  { TT_FUNCTION, zStrict_Ansi_NotFTst0,   0 /* unused */ },
+  { TT_NEGREP,   zStrict_Ansi_NotBypass0, (regex_t*)NULL },
+  { TT_NEGREP,   zStrict_Ansi_NotBypass1, (regex_t*)NULL },
+  { TT_EGREP,    zStrict_Ansi_NotSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Strict_Ansi_Not
+ */
+static const char* apzStrict_Ansi_NotPatch[] = {
     "format",
-    "#define\tUINT8_C(c)\t(c)\n\
-%1\n\
-#define\tUINT16_C(c)\t(c)",
+    "%1 !defined(__STRICT_ANSI__)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Int_Limits_1 fix
+ *  Description of Strict_Ansi_Not_Ctd fix
  */
-tSCC zSolaris_Int_Limits_1Name[] =
-     "solaris_int_limits_1";
+tSCC zStrict_Ansi_Not_CtdName[] =
+     "strict_ansi_not_ctd";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Int_Limits_1List[] =
-  "sys/int_limits.h\0";
+tSCC zStrict_Ansi_Not_CtdList[] =
+  "math.h\0limits.h\0stdio.h\0signal.h\0stdlib.h\0sys/signal.h\0time.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Int_Limits_1Machs[] = {
-        "*-*-solaris2*",
-        (const char*)NULL };
+#define apzStrict_Ansi_Not_CtdMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Int_Limits_1Select0[] =
-       "^#define[ \t]+UINT8_MAX[ \t]+\\(255U\\)\n\
-#define[ \t]+UINT16_MAX[ \t]+\\(65535U\\)";
+tSCC zStrict_Ansi_Not_CtdSelect0[] =
+       "^([ \t]*(\\(|&&|\\|\\|)([ \t(]*!*[ \t]*defined\\([a-zA-Z_0-9]+\\)[ \t]*[|&][|&])*[ \t(]*)(__STDC__[ \t]*(|-[ \t]*0[ \t]*)==[ \t]*0)";
 
-#define    SOLARIS_INT_LIMITS_1_TEST_CT  1
-static tTestDesc aSolaris_Int_Limits_1Tests[] = {
-  { TT_EGREP,    zSolaris_Int_Limits_1Select0, (regex_t*)NULL }, };
+/*
+ *  perform the C function call test
+ */
+tSCC zStrict_Ansi_Not_CtdFTst0[] = "stdc_0_in_system_headers";
+
+#define    STRICT_ANSI_NOT_CTD_TEST_CT  2
+static tTestDesc aStrict_Ansi_Not_CtdTests[] = {
+  { TT_FUNCTION, zStrict_Ansi_Not_CtdFTst0,   0 /* unused */ },
+  { TT_EGREP,    zStrict_Ansi_Not_CtdSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Int_Limits_1
+ *  Fix Command Arguments for Strict_Ansi_Not_Ctd
  */
-static const char* apzSolaris_Int_Limits_1Patch[] = {
+static const char* apzStrict_Ansi_Not_CtdPatch[] = {
     "format",
-    "#define\tUINT8_MAX\t(255)\n\
-#define\tUINT16_MAX\t(65535)",
+    "%1 !defined(__STRICT_ANSI__)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Int_Limits_2 fix
+ *  Description of Strict_Ansi_Only fix
  */
-tSCC zSolaris_Int_Limits_2Name[] =
-     "solaris_int_limits_2";
+tSCC zStrict_Ansi_OnlyName[] =
+     "strict_ansi_only";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Int_Limits_2List[] =
-  "sys/int_limits.h\0";
+#define zStrict_Ansi_OnlyList (char*)NULL
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Int_Limits_2Machs[] = {
-        "*-*-solaris2*",
-        (const char*)NULL };
+#define apzStrict_Ansi_OnlyMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Int_Limits_2Select0[] =
-       "^#define[ \t]+(INT|UINT)_FAST16_(MAX|MIN)[ \t](INT|UINT)16.*";
+tSCC zStrict_Ansi_OnlySelect0[] =
+       "^([ \t]*#[ \t]*if.*)(__STDC__[ \t]*!=[ \t]*0|__STDC__[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*!=[ \t]*0)";
 
-#define    SOLARIS_INT_LIMITS_2_TEST_CT  1
-static tTestDesc aSolaris_Int_Limits_2Tests[] = {
-  { TT_EGREP,    zSolaris_Int_Limits_2Select0, (regex_t*)NULL }, };
+/*
+ *  perform the C function call test
+ */
+tSCC zStrict_Ansi_OnlyFTst0[] = "stdc_0_in_system_headers";
+
+#define    STRICT_ANSI_ONLY_TEST_CT  2
+static tTestDesc aStrict_Ansi_OnlyTests[] = {
+  { TT_FUNCTION, zStrict_Ansi_OnlyFTst0,   0 /* unused */ },
+  { TT_EGREP,    zStrict_Ansi_OnlySelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Int_Limits_2
+ *  Fix Command Arguments for Strict_Ansi_Only
  */
-static const char* apzSolaris_Int_Limits_2Patch[] = {
+static const char* apzStrict_Ansi_OnlyPatch[] = {
     "format",
-    "#define\t%1_FAST16_%2 %132_%2",
+    "%1 defined(__STRICT_ANSI__)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Int_Limits_3 fix
+ *  Description of Struct_File fix
  */
-tSCC zSolaris_Int_Limits_3Name[] =
-     "solaris_int_limits_3";
+tSCC zStruct_FileName[] =
+     "struct_file";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Int_Limits_3List[] =
-  "sys/int_limits.h\0";
+tSCC zStruct_FileList[] =
+  "rpc/xdr.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Int_Limits_3Machs[] = {
-        "*-*-solaris2*",
-        (const char*)NULL };
+#define apzStruct_FileMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Int_Limits_3Select0[] =
-       "^#define[ \t]+SIZE_MAX[ \t]+4294967295UL";
+tSCC zStruct_FileSelect0[] =
+       "^.*xdrstdio_create.*struct __file_s";
 
-#define    SOLARIS_INT_LIMITS_3_TEST_CT  1
-static tTestDesc aSolaris_Int_Limits_3Tests[] = {
-  { TT_EGREP,    zSolaris_Int_Limits_3Select0, (regex_t*)NULL }, };
+#define    STRUCT_FILE_TEST_CT  1
+static tTestDesc aStruct_FileTests[] = {
+  { TT_EGREP,    zStruct_FileSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Int_Limits_3
+ *  Fix Command Arguments for Struct_File
  */
-static const char* apzSolaris_Int_Limits_3Patch[] = {
+static const char* apzStruct_FilePatch[] = {
     "format",
-    "#define\tSIZE_MAX\t4294967295U",
+    "struct __file_s;\n\
+%0",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Int_Types fix
+ *  Description of Struct_Sockaddr fix
  */
-tSCC zSolaris_Int_TypesName[] =
-     "solaris_int_types";
+tSCC zStruct_SockaddrName[] =
+     "struct_sockaddr";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Int_TypesList[] =
-  "sys/int_types.h\0";
+tSCC zStruct_SockaddrList[] =
+  "rpc/auth.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Int_TypesMachs (const char**)NULL
+#define apzStruct_SockaddrMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Int_TypesSelect0[] =
-       "__STDC__ - 0 == 0";
+tSCC zStruct_SockaddrSelect0[] =
+       "^.*authdes_create.*struct sockaddr[^_]";
 
 /*
  *  content bypass pattern - skip fix if pattern found
  */
-tSCC zSolaris_Int_TypesBypass0[] =
-       "_LONGLONG_TYPE";
+tSCC zStruct_SockaddrBypass0[] =
+       "<sys/socket.h>";
+tSCC zStruct_SockaddrBypass1[] =
+       "struct sockaddr;\n";
 
-#define    SOLARIS_INT_TYPES_TEST_CT  2
-static tTestDesc aSolaris_Int_TypesTests[] = {
-  { TT_NEGREP,   zSolaris_Int_TypesBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Int_TypesSelect0, (regex_t*)NULL }, };
+#define    STRUCT_SOCKADDR_TEST_CT  3
+static tTestDesc aStruct_SockaddrTests[] = {
+  { TT_NEGREP,   zStruct_SockaddrBypass0, (regex_t*)NULL },
+  { TT_NEGREP,   zStruct_SockaddrBypass1, (regex_t*)NULL },
+  { TT_EGREP,    zStruct_SockaddrSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Int_Types
+ *  Fix Command Arguments for Struct_Sockaddr
  */
-static const char* apzSolaris_Int_TypesPatch[] = {
+static const char* apzStruct_SockaddrPatch[] = {
     "format",
-    "(defined(_STDC_C99) || !defined(_STRICT_STDC) || defined(__GNUC__))",
+    "struct sockaddr;\n\
+%0",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Stdio_Tag fix
+ *  Description of Sun_Auth_Proto fix
  */
-tSCC zSolaris_Stdio_TagName[] =
-     "solaris_stdio_tag";
+tSCC zSun_Auth_ProtoName[] =
+     "sun_auth_proto";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Stdio_TagList[] =
-  "stdio_tag.h\0";
+tSCC zSun_Auth_ProtoList[] =
+  "rpc/auth.h\0rpc/clnt.h\0rpc/svc.h\0rpc/xdr.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Stdio_TagMachs (const char**)NULL
+#define apzSun_Auth_ProtoMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Stdio_TagSelect0[] =
-       "__cplusplus < 54321L";
+tSCC zSun_Auth_ProtoSelect0[] =
+       "\\(\\*[a-z][a-z_]*\\)\\(\\)";
 
 /*
  *  content bypass pattern - skip fix if pattern found
  */
-tSCC zSolaris_Stdio_TagBypass0[] =
-       "__GNUC__";
+tSCC zSun_Auth_ProtoBypass0[] =
+       "__cplusplus";
 
-#define    SOLARIS_STDIO_TAG_TEST_CT  2
-static tTestDesc aSolaris_Stdio_TagTests[] = {
-  { TT_NEGREP,   zSolaris_Stdio_TagBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_Stdio_TagSelect0, (regex_t*)NULL }, };
+#define    SUN_AUTH_PROTO_TEST_CT  2
+static tTestDesc aSun_Auth_ProtoTests[] = {
+  { TT_NEGREP,   zSun_Auth_ProtoBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSun_Auth_ProtoSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Stdio_Tag
+ *  Fix Command Arguments for Sun_Auth_Proto
  */
-static const char* apzSolaris_Stdio_TagPatch[] = { sed_cmd_z,
-    "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/",
+static const char* apzSun_Auth_ProtoPatch[] = {
+    "format",
+    "#ifdef __cplusplus\n\
+%1(...);%2\n\
+#else\n\
+%1();%2\n\
+#endif",
+    "(.*\\(\\*[a-z][a-z_]*\\))\\(\\);(.*)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Sys_Va_List fix
+ *  Description of Sun_Bogus_Ifdef fix
  */
-tSCC zSolaris_Sys_Va_ListName[] =
-     "solaris_sys_va_list";
+tSCC zSun_Bogus_IfdefName[] =
+     "sun_bogus_ifdef";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Sys_Va_ListList[] =
-  "sys/va_list.h\0";
+tSCC zSun_Bogus_IfdefList[] =
+  "hsfs/hsfs_spec.h\0hsfs/iso_spec.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Sys_Va_ListMachs[] = {
-        "*-*-solaris2.[89]",
-        (const char*)NULL };
+#define apzSun_Bogus_IfdefMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Sys_Va_ListSelect0[] =
-       "#if.*__STDC__.*\n\
-typedef void \\*__va_list;\n\
-#else\n\
-typedef char \\*__va_list;\n\
-#endif";
+tSCC zSun_Bogus_IfdefSelect0[] =
+       "#ifdef(.*\\|\\|.*)";
 
-#define    SOLARIS_SYS_VA_LIST_TEST_CT  1
-static tTestDesc aSolaris_Sys_Va_ListTests[] = {
-  { TT_EGREP,    zSolaris_Sys_Va_ListSelect0, (regex_t*)NULL }, };
+#define    SUN_BOGUS_IFDEF_TEST_CT  1
+static tTestDesc aSun_Bogus_IfdefTests[] = {
+  { TT_EGREP,    zSun_Bogus_IfdefSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Sys_Va_List
+ *  Fix Command Arguments for Sun_Bogus_Ifdef
  */
-static const char* apzSolaris_Sys_Va_ListPatch[] = {
+static const char* apzSun_Bogus_IfdefPatch[] = {
     "format",
-    "#ifdef __GNUC__\n\
-typedef __builtin_va_list __va_list;\n\
-#else\n\
-%0\n\
-#endif",
+    "#if%1",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Statsswtch fix
+ *  Description of Sun_Catmacro fix
  */
-tSCC zStatsswtchName[] =
-     "statsswtch";
+tSCC zSun_CatmacroName[] =
+     "sun_catmacro";
 
 /*
  *  File name selection pattern
  */
-tSCC zStatsswtchList[] =
-  "rpcsvc/rstat.h\0";
+tSCC zSun_CatmacroList[] =
+  "pixrect/memvar.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzStatsswtchMachs (const char**)NULL
+#define apzSun_CatmacroMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zStatsswtchSelect0[] =
-       "boottime$";
+tSCC zSun_CatmacroSelect0[] =
+       "^#define[ \t]+CAT\\(a,b\\).*";
 
-#define    STATSSWTCH_TEST_CT  1
-static tTestDesc aStatsswtchTests[] = {
-  { TT_EGREP,    zStatsswtchSelect0, (regex_t*)NULL }, };
+#define    SUN_CATMACRO_TEST_CT  1
+static tTestDesc aSun_CatmacroTests[] = {
+  { TT_EGREP,    zSun_CatmacroSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Statsswtch
+ *  Fix Command Arguments for Sun_Catmacro
  */
-static const char* apzStatsswtchPatch[] = {
+static const char* apzSun_CatmacroPatch[] = {
     "format",
-    "boottime;",
+    "#ifdef __STDC__\n\
+#  define CAT(a,b) a##b\n\
+#else\n\
+%0\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Stdio_Stdarg_H fix
+ *  Description of Sun_Malloc fix
  */
-tSCC zStdio_Stdarg_HName[] =
-     "stdio_stdarg_h";
+tSCC zSun_MallocName[] =
+     "sun_malloc";
 
 /*
  *  File name selection pattern
  */
-tSCC zStdio_Stdarg_HList[] =
-  "stdio.h\0";
+tSCC zSun_MallocList[] =
+  "malloc.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzStdio_Stdarg_HMachs[] = {
-        "*-*-solaris2.1[0-9]*",
-        (const char*)NULL };
+#define apzSun_MallocMachs (const char**)NULL
 
 /*
  *  content bypass pattern - skip fix if pattern found
  */
-tSCC zStdio_Stdarg_HBypass0[] =
-       "include.*(stdarg.h|machine/ansi.h)";
+tSCC zSun_MallocBypass0[] =
+       "_CLASSIC_ANSI_TYPES";
 
-#define    STDIO_STDARG_H_TEST_CT  1
-static tTestDesc aStdio_Stdarg_HTests[] = {
-  { TT_NEGREP,   zStdio_Stdarg_HBypass0, (regex_t*)NULL }, };
+#define    SUN_MALLOC_TEST_CT  1
+static tTestDesc aSun_MallocTests[] = {
+  { TT_NEGREP,   zSun_MallocBypass0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Stdio_Stdarg_H
+ *  Fix Command Arguments for Sun_Malloc
  */
-static const char* apzStdio_Stdarg_HPatch[] = {
-    "wrap",
-    "#define __need___va_list\n\
-#include <stdarg.h>\n",
+static const char* apzSun_MallocPatch[] = { sed_cmd_z,
+    "-e", "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g",
+    "-e", "s/int[ \t][ \t]*free/void\tfree/g",
+    "-e", "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g",
+    "-e", "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g",
+    "-e", "s/char\\([ \t]*\\*[ \t]*calloc\\)/void\\1/g",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Stdio_Va_List fix
+ *  Description of Sun_Rusers_Semi fix
  */
-tSCC zStdio_Va_ListName[] =
-     "stdio_va_list";
+tSCC zSun_Rusers_SemiName[] =
+     "sun_rusers_semi";
 
 /*
  *  File name selection pattern
  */
-tSCC zStdio_Va_ListList[] =
-  "stdio.h\0internal/stdio_core.h\0internal/wchar_core.h\0";
+tSCC zSun_Rusers_SemiList[] =
+  "rpcsvc/rusers.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzStdio_Va_ListMachs[] = {
-        "*-*-solaris2.1[0-9]*",
-        (const char*)NULL };
+#define apzSun_Rusers_SemiMachs (const char**)NULL
 
 /*
- *  content bypass pattern - skip fix if pattern found
+ *  content selection pattern - do fix if pattern found
  */
-tSCC zStdio_Va_ListBypass0[] =
-       "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list";
+tSCC zSun_Rusers_SemiSelect0[] =
+       "_cnt$";
 
-#define    STDIO_VA_LIST_TEST_CT  1
-static tTestDesc aStdio_Va_ListTests[] = {
-  { TT_NEGREP,   zStdio_Va_ListBypass0, (regex_t*)NULL }, };
+#define    SUN_RUSERS_SEMI_TEST_CT  1
+static tTestDesc aSun_Rusers_SemiTests[] = {
+  { TT_EGREP,    zSun_Rusers_SemiSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Stdio_Va_List
+ *  Fix Command Arguments for Sun_Rusers_Semi
  */
-static const char* apzStdio_Va_ListPatch[] = { sed_cmd_z,
-    "-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\
-s@(va_list)&@(__gnuc_va_list)\\&@\n\
-s@ _VA_LIST_));@ __gnuc_va_list));@\n\
-s@ __VA_LIST__));@ __gnuc_va_list));@\n\
-s@ va_list@ __not_va_list__@\n\
-s@\\*va_list@*__not_va_list__@\n\
-s@ __va_list)@ __gnuc_va_list)@\n\
-s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\
-s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n\
-s@GNUC_VA_LIST@GNUC_Va_LIST@\n\
-s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n\
-s@_NEED___VA_LIST@_NEED___Va_LIST@\n\
-s@VA_LIST@DUMMY_VA_LIST@\n\
-s@_Va_LIST@_VA_LIST@",
+static const char* apzSun_Rusers_SemiPatch[] = { sed_cmd_z,
+    "-e", "/^struct/,/^};/s/_cnt$/_cnt;/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Stdio_Va_List_Clients fix
+ *  Description of Sun_Signal fix
  */
-tSCC zStdio_Va_List_ClientsName[] =
-     "stdio_va_list_clients";
+tSCC zSun_SignalName[] =
+     "sun_signal";
 
 /*
  *  File name selection pattern
  */
-tSCC zStdio_Va_List_ClientsList[] =
-  "com_err.h\0cps.h\0curses.h\0krb5.h\0lc_core.h\0pfmt.h\0wchar.h\0curses_colr/curses.h\0";
+tSCC zSun_SignalList[] =
+  "sys/signal.h\0signal.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzStdio_Va_List_ClientsMachs (const char**)NULL
+#define apzSun_SignalMachs (const char**)NULL
 
 /*
- *  content bypass pattern - skip fix if pattern found
+ *  content selection pattern - do fix if pattern found
  */
-tSCC zStdio_Va_List_ClientsBypass0[] =
-       "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list";
-tSCC zStdio_Va_List_ClientsBypass1[] =
-       "include <stdarg\\.h>|#ifdef va_start";
+tSCC zSun_SignalSelect0[] =
+       "^void\t\\(\\*signal\\(\\)\\)\\(\\);.*";
 
-#define    STDIO_VA_LIST_CLIENTS_TEST_CT  2
-static tTestDesc aStdio_Va_List_ClientsTests[] = {
-  { TT_NEGREP,   zStdio_Va_List_ClientsBypass0, (regex_t*)NULL },
-  { TT_NEGREP,   zStdio_Va_List_ClientsBypass1, (regex_t*)NULL }, };
+#define    SUN_SIGNAL_TEST_CT  1
+static tTestDesc aSun_SignalTests[] = {
+  { TT_EGREP,    zSun_SignalSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Stdio_Va_List_Clients
+ *  Fix Command Arguments for Sun_Signal
  */
-static const char* apzStdio_Va_List_ClientsPatch[] = { sed_cmd_z,
-    "-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\
-s@(va_list)&@(__gnuc_va_list)\\&@\n\
-s@ _VA_LIST_));@ __gnuc_va_list));@\n\
-s@ __VA_LIST__));@ __gnuc_va_list));@\n\
-s@ va_list@ __not_va_list__@\n\
-s@\\*va_list@*__not_va_list__@\n\
-s@ __va_list)@ __gnuc_va_list)@\n\
-s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\
-s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n\
-s@GNUC_VA_LIST@GNUC_Va_LIST@\n\
-s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n\
-s@_NEED___VA_LIST@_NEED___Va_LIST@\n\
-s@VA_LIST@DUMMY_VA_LIST@\n\
-s@_Va_LIST@_VA_LIST@",
+static const char* apzSun_SignalPatch[] = {
+    "format",
+    "#ifdef __cplusplus\n\
+void\t(*signal(...))(...);\n\
+#else\n\
+%0\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Strict_Ansi_Not fix
+ *  Description of Sunos_Strlen fix
  */
-tSCC zStrict_Ansi_NotName[] =
-     "strict_ansi_not";
+tSCC zSunos_StrlenName[] =
+     "sunos_strlen";
 
 /*
  *  File name selection pattern
  */
-#define zStrict_Ansi_NotList (char*)NULL
+tSCC zSunos_StrlenList[] =
+  "strings.h\0";
 /*
  *  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";
-tSCC zStrict_Ansi_NotBypass1[] =
-       "__SCO_VERSION__.*__STDC__ != 1";
+#define apzSunos_StrlenMachs (const char**)NULL
 
 /*
- *  perform the C function call test
+ *  content selection pattern - do fix if pattern found
  */
-tSCC zStrict_Ansi_NotFTst0[] = "stdc_0_in_system_headers";
+tSCC zSunos_StrlenSelect0[] =
+       "int[ \t]*strlen\\(\\);(.*)";
 
-#define    STRICT_ANSI_NOT_TEST_CT  4
-static tTestDesc aStrict_Ansi_NotTests[] = {
-  { TT_FUNCTION, zStrict_Ansi_NotFTst0,   0 /* unused */ },
-  { TT_NEGREP,   zStrict_Ansi_NotBypass0, (regex_t*)NULL },
-  { TT_NEGREP,   zStrict_Ansi_NotBypass1, (regex_t*)NULL },
-  { TT_EGREP,    zStrict_Ansi_NotSelect0, (regex_t*)NULL }, };
+#define    SUNOS_STRLEN_TEST_CT  1
+static tTestDesc aSunos_StrlenTests[] = {
+  { TT_EGREP,    zSunos_StrlenSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Strict_Ansi_Not
+ *  Fix Command Arguments for Sunos_Strlen
  */
-static const char* apzStrict_Ansi_NotPatch[] = {
+static const char* apzSunos_StrlenPatch[] = {
     "format",
-    "%1 !defined(__STRICT_ANSI__)",
+    "__SIZE_TYPE__ strlen();%1",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Strict_Ansi_Not_Ctd fix
+ *  Description of Suse_Linux_Vt_Cxx fix
  */
-tSCC zStrict_Ansi_Not_CtdName[] =
-     "strict_ansi_not_ctd";
+tSCC zSuse_Linux_Vt_CxxName[] =
+     "suse_linux_vt_cxx";
 
 /*
  *  File name selection pattern
  */
-tSCC zStrict_Ansi_Not_CtdList[] =
-  "math.h\0limits.h\0stdio.h\0signal.h\0stdlib.h\0sys/signal.h\0time.h\0";
+tSCC zSuse_Linux_Vt_CxxList[] =
+  "linux/vt.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzStrict_Ansi_Not_CtdMachs (const char**)NULL
+#define apzSuse_Linux_Vt_CxxMachs (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";
+tSCC zSuse_Linux_Vt_CxxSelect0[] =
+       "^[ \t]*unsigned int new;";
 
-#define    STRICT_ANSI_NOT_CTD_TEST_CT  2
-static tTestDesc aStrict_Ansi_Not_CtdTests[] = {
-  { TT_FUNCTION, zStrict_Ansi_Not_CtdFTst0,   0 /* unused */ },
-  { TT_EGREP,    zStrict_Ansi_Not_CtdSelect0, (regex_t*)NULL }, };
+#define    SUSE_LINUX_VT_CXX_TEST_CT  1
+static tTestDesc aSuse_Linux_Vt_CxxTests[] = {
+  { TT_EGREP,    zSuse_Linux_Vt_CxxSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Strict_Ansi_Not_Ctd
+ *  Fix Command Arguments for Suse_Linux_Vt_Cxx
  */
-static const char* apzStrict_Ansi_Not_CtdPatch[] = {
+static const char* apzSuse_Linux_Vt_CxxPatch[] = {
     "format",
-    "%1 !defined(__STRICT_ANSI__)",
+    "unsigned int newev;",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Strict_Ansi_Only fix
+ *  Description of Svr4_Disable_Opt fix
  */
-tSCC zStrict_Ansi_OnlyName[] =
-     "strict_ansi_only";
+tSCC zSvr4_Disable_OptName[] =
+     "svr4_disable_opt";
 
 /*
  *  File name selection pattern
  */
-#define zStrict_Ansi_OnlyList (char*)NULL
+tSCC zSvr4_Disable_OptList[] =
+  "string.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzStrict_Ansi_OnlyMachs (const char**)NULL
+#define apzSvr4_Disable_OptMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zStrict_Ansi_OnlySelect0[] =
-       "^([ \t]*#[ \t]*if.*)(__STDC__[ \t]*!=[ \t]*0|__STDC__[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*!=[ \t]*0)";
-
-/*
- *  perform the C function call test
- */
-tSCC zStrict_Ansi_OnlyFTst0[] = "stdc_0_in_system_headers";
+tSCC zSvr4_Disable_OptSelect0[] =
+       "#define.*__std_hdr_";
 
-#define    STRICT_ANSI_ONLY_TEST_CT  2
-static tTestDesc aStrict_Ansi_OnlyTests[] = {
-  { TT_FUNCTION, zStrict_Ansi_OnlyFTst0,   0 /* unused */ },
-  { TT_EGREP,    zStrict_Ansi_OnlySelect0, (regex_t*)NULL }, };
+#define    SVR4_DISABLE_OPT_TEST_CT  1
+static tTestDesc aSvr4_Disable_OptTests[] = {
+  { TT_EGREP,    zSvr4_Disable_OptSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Strict_Ansi_Only
+ *  Fix Command Arguments for Svr4_Disable_Opt
  */
-static const char* apzStrict_Ansi_OnlyPatch[] = {
-    "format",
-    "%1 defined(__STRICT_ANSI__)",
+static const char* apzSvr4_Disable_OptPatch[] = { sed_cmd_z,
+    "-e", "/#define.*__std_hdr_/d",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Struct_File fix
+ *  Description of Svr4_Getcwd fix
  */
-tSCC zStruct_FileName[] =
-     "struct_file";
+tSCC zSvr4_GetcwdName[] =
+     "svr4_getcwd";
 
 /*
  *  File name selection pattern
  */
-tSCC zStruct_FileList[] =
-  "rpc/xdr.h\0";
+tSCC zSvr4_GetcwdList[] =
+  "stdlib.h\0unistd.h\0prototypes.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzStruct_FileMachs (const char**)NULL
+#define apzSvr4_GetcwdMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zStruct_FileSelect0[] =
-       "^.*xdrstdio_create.*struct __file_s";
+tSCC zSvr4_GetcwdSelect0[] =
+       "getcwd\\(char \\*, int\\)";
 
-#define    STRUCT_FILE_TEST_CT  1
-static tTestDesc aStruct_FileTests[] = {
-  { TT_EGREP,    zStruct_FileSelect0, (regex_t*)NULL }, };
+#define    SVR4_GETCWD_TEST_CT  1
+static tTestDesc aSvr4_GetcwdTests[] = {
+  { TT_EGREP,    zSvr4_GetcwdSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Struct_File
+ *  Fix Command Arguments for Svr4_Getcwd
  */
-static const char* apzStruct_FilePatch[] = {
+static const char* apzSvr4_GetcwdPatch[] = {
     "format",
-    "struct __file_s;\n\
-%0",
+    "getcwd(char *, size_t)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Struct_Sockaddr fix
+ *  Description of Svr4_Profil fix
  */
-tSCC zStruct_SockaddrName[] =
-     "struct_sockaddr";
+tSCC zSvr4_ProfilName[] =
+     "svr4_profil";
 
 /*
  *  File name selection pattern
  */
-tSCC zStruct_SockaddrList[] =
-  "rpc/auth.h\0";
+tSCC zSvr4_ProfilList[] =
+  "stdlib.h\0unistd.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzStruct_SockaddrMachs (const char**)NULL
+#define apzSvr4_ProfilMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zStruct_SockaddrSelect0[] =
-       "^.*authdes_create.*struct sockaddr[^_]";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zStruct_SockaddrBypass0[] =
-       "<sys/socket.h>";
-tSCC zStruct_SockaddrBypass1[] =
-       "struct sockaddr;\n";
+tSCC zSvr4_ProfilSelect0[] =
+       "profil\\(unsigned short \\*, unsigned int, unsigned int, unsigned int\\)";
 
-#define    STRUCT_SOCKADDR_TEST_CT  3
-static tTestDesc aStruct_SockaddrTests[] = {
-  { TT_NEGREP,   zStruct_SockaddrBypass0, (regex_t*)NULL },
-  { TT_NEGREP,   zStruct_SockaddrBypass1, (regex_t*)NULL },
-  { TT_EGREP,    zStruct_SockaddrSelect0, (regex_t*)NULL }, };
+#define    SVR4_PROFIL_TEST_CT  1
+static tTestDesc aSvr4_ProfilTests[] = {
+  { TT_EGREP,    zSvr4_ProfilSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Struct_Sockaddr
+ *  Fix Command Arguments for Svr4_Profil
  */
-static const char* apzStruct_SockaddrPatch[] = {
+static const char* apzSvr4_ProfilPatch[] = {
     "format",
-    "struct sockaddr;\n\
-%0",
+    "profil(unsigned short *, size_t, int, unsigned int)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sun_Auth_Proto fix
+ *  Description of Svr4_Sighandler_Type fix
  */
-tSCC zSun_Auth_ProtoName[] =
-     "sun_auth_proto";
+tSCC zSvr4_Sighandler_TypeName[] =
+     "svr4_sighandler_type";
 
 /*
  *  File name selection pattern
  */
-tSCC zSun_Auth_ProtoList[] =
-  "rpc/auth.h\0rpc/clnt.h\0rpc/svc.h\0rpc/xdr.h\0";
+tSCC zSvr4_Sighandler_TypeList[] =
+  "sys/signal.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSun_Auth_ProtoMachs (const char**)NULL
+#define apzSvr4_Sighandler_TypeMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSun_Auth_ProtoSelect0[] =
-       "\\(\\*[a-z][a-z_]*\\)\\(\\)";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSun_Auth_ProtoBypass0[] =
-       "__cplusplus";
+tSCC zSvr4_Sighandler_TypeSelect0[] =
+       "void *\\(\\*\\)\\(\\)";
 
-#define    SUN_AUTH_PROTO_TEST_CT  2
-static tTestDesc aSun_Auth_ProtoTests[] = {
-  { TT_NEGREP,   zSun_Auth_ProtoBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSun_Auth_ProtoSelect0, (regex_t*)NULL }, };
+#define    SVR4_SIGHANDLER_TYPE_TEST_CT  1
+static tTestDesc aSvr4_Sighandler_TypeTests[] = {
+  { TT_EGREP,    zSvr4_Sighandler_TypeSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sun_Auth_Proto
+ *  Fix Command Arguments for Svr4_Sighandler_Type
  */
-static const char* apzSun_Auth_ProtoPatch[] = {
+static const char* apzSvr4_Sighandler_TypePatch[] = {
     "format",
-    "#ifdef __cplusplus\n\
-%1(...);%2\n\
-#else\n\
-%1();%2\n\
-#endif",
-    "(.*\\(\\*[a-z][a-z_]*\\))\\(\\);(.*)",
+    "void (*)(int)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sun_Bogus_Ifdef fix
+ *  Description of Svr4_Undeclared_Getrnge fix
  */
-tSCC zSun_Bogus_IfdefName[] =
-     "sun_bogus_ifdef";
+tSCC zSvr4_Undeclared_GetrngeName[] =
+     "svr4_undeclared_getrnge";
 
 /*
  *  File name selection pattern
  */
-tSCC zSun_Bogus_IfdefList[] =
-  "hsfs/hsfs_spec.h\0hsfs/iso_spec.h\0";
+tSCC zSvr4_Undeclared_GetrngeList[] =
+  "regexp.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSun_Bogus_IfdefMachs (const char**)NULL
+#define apzSvr4_Undeclared_GetrngeMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSun_Bogus_IfdefSelect0[] =
-       "#ifdef(.*\\|\\|.*)";
+tSCC zSvr4_Undeclared_GetrngeSelect0[] =
+       "getrnge";
 
-#define    SUN_BOGUS_IFDEF_TEST_CT  1
-static tTestDesc aSun_Bogus_IfdefTests[] = {
-  { TT_EGREP,    zSun_Bogus_IfdefSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSvr4_Undeclared_GetrngeBypass0[] =
+       "static void getrnge";
+
+#define    SVR4_UNDECLARED_GETRNGE_TEST_CT  2
+static tTestDesc aSvr4_Undeclared_GetrngeTests[] = {
+  { TT_NEGREP,   zSvr4_Undeclared_GetrngeBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSvr4_Undeclared_GetrngeSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sun_Bogus_Ifdef
+ *  Fix Command Arguments for Svr4_Undeclared_Getrnge
  */
-static const char* apzSun_Bogus_IfdefPatch[] = {
+static const char* apzSvr4_Undeclared_GetrngePatch[] = {
     "format",
-    "#if%1",
+    "%0\n\
+static int getrnge ();",
+    "^static int[ \t]+size;",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sun_Catmacro fix
+ *  Description of Sysv68_String fix
  */
-tSCC zSun_CatmacroName[] =
-     "sun_catmacro";
+tSCC zSysv68_StringName[] =
+     "sysv68_string";
 
 /*
  *  File name selection pattern
  */
-tSCC zSun_CatmacroList[] =
-  "pixrect/memvar.h\0";
+tSCC zSysv68_StringList[] =
+  "testing.h\0string.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSun_CatmacroMachs (const char**)NULL
+#define apzSysv68_StringMachs (const char**)NULL
 
 /*
- *  content selection pattern - do fix if pattern found
+ *  content bypass pattern - skip fix if pattern found
  */
-tSCC zSun_CatmacroSelect0[] =
-       "^#define[ \t]+CAT\\(a,b\\).*";
-
-#define    SUN_CATMACRO_TEST_CT  1
-static tTestDesc aSun_CatmacroTests[] = {
-  { TT_EGREP,    zSun_CatmacroSelect0, (regex_t*)NULL }, };
+tSCC zSysv68_StringBypass0[] =
+       "_CLASSIC_ANSI_TYPES";
 
-/*
- *  Fix Command Arguments for Sun_Catmacro
- */
-static const char* apzSun_CatmacroPatch[] = {
-    "format",
-    "#ifdef __STDC__\n\
-#  define CAT(a,b) a##b\n\
-#else\n\
-%0\n\
-#endif",
+#define    SYSV68_STRING_TEST_CT  1
+static tTestDesc aSysv68_StringTests[] = {
+  { TT_NEGREP,   zSysv68_StringBypass0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Sysv68_String
+ */
+static const char* apzSysv68_StringPatch[] = { sed_cmd_z,
+    "-e", "s/extern[ \t]*int[ \t]*strlen();/extern unsigned int strlen();/",
+    "-e", "s/extern[ \t]*int[ \t]*ffs[ \t]*(long);/extern int ffs(int);/",
+    "-e", "s/strdup(char \\*s1);/strdup(const char *s1);/",
+    "-e", "/^extern char$/N",
+    "-e", "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/",
+    "-e", "/^extern int$/N",
+    "-e", "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/",
+    "-e", "/^\tstrncmp(),$/N",
+    "-e", "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n\
+extern unsigned int\\\n\
+\\2/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sun_Malloc fix
+ *  Description of Sysz_Stdlib_For_Sun fix
  */
-tSCC zSun_MallocName[] =
-     "sun_malloc";
+tSCC zSysz_Stdlib_For_SunName[] =
+     "sysz_stdlib_for_sun";
 
 /*
  *  File name selection pattern
  */
-tSCC zSun_MallocList[] =
-  "malloc.h\0";
+tSCC zSysz_Stdlib_For_SunList[] =
+  "stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSun_MallocMachs (const char**)NULL
+#define apzSysz_Stdlib_For_SunMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSysz_Stdlib_For_SunSelect0[] =
+       "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\(";
 
 /*
  *  content bypass pattern - skip fix if pattern found
  */
-tSCC zSun_MallocBypass0[] =
+tSCC zSysz_Stdlib_For_SunBypass0[] =
        "_CLASSIC_ANSI_TYPES";
 
-#define    SUN_MALLOC_TEST_CT  1
-static tTestDesc aSun_MallocTests[] = {
-  { TT_NEGREP,   zSun_MallocBypass0, (regex_t*)NULL }, };
+#define    SYSZ_STDLIB_FOR_SUN_TEST_CT  2
+static tTestDesc aSysz_Stdlib_For_SunTests[] = {
+  { TT_NEGREP,   zSysz_Stdlib_For_SunBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSysz_Stdlib_For_SunSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sun_Malloc
+ *  Fix Command Arguments for Sysz_Stdlib_For_Sun
  */
-static const char* apzSun_MallocPatch[] = { sed_cmd_z,
-    "-e", "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g",
-    "-e", "s/int[ \t][ \t]*free/void\tfree/g",
-    "-e", "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g",
-    "-e", "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g",
-    "-e", "s/char\\([ \t]*\\*[ \t]*calloc\\)/void\\1/g",
+static const char* apzSysz_Stdlib_For_SunPatch[] = {
+    "format",
+    "void *\t%1(",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sun_Rusers_Semi fix
+ *  Description of Thread_Keyword fix
  */
-tSCC zSun_Rusers_SemiName[] =
-     "sun_rusers_semi";
+tSCC zThread_KeywordName[] =
+     "thread_keyword";
 
 /*
  *  File name selection pattern
  */
-tSCC zSun_Rusers_SemiList[] =
-  "rpcsvc/rusers.h\0";
+tSCC zThread_KeywordList[] =
+  "pthread.h\0bits/sigthread.h\0*/bits/sigthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSun_Rusers_SemiMachs (const char**)NULL
+#define apzThread_KeywordMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSun_Rusers_SemiSelect0[] =
-       "_cnt$";
+tSCC zThread_KeywordSelect0[] =
+       "([* ])__thread([,)])";
 
-#define    SUN_RUSERS_SEMI_TEST_CT  1
-static tTestDesc aSun_Rusers_SemiTests[] = {
-  { TT_EGREP,    zSun_Rusers_SemiSelect0, (regex_t*)NULL }, };
+#define    THREAD_KEYWORD_TEST_CT  1
+static tTestDesc aThread_KeywordTests[] = {
+  { TT_EGREP,    zThread_KeywordSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sun_Rusers_Semi
+ *  Fix Command Arguments for Thread_Keyword
  */
-static const char* apzSun_Rusers_SemiPatch[] = { sed_cmd_z,
-    "-e", "/^struct/,/^};/s/_cnt$/_cnt;/",
+static const char* apzThread_KeywordPatch[] = {
+    "format",
+    "%1__thr%2",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sun_Signal fix
+ *  Description of Tinfo_Cplusplus fix
  */
-tSCC zSun_SignalName[] =
-     "sun_signal";
+tSCC zTinfo_CplusplusName[] =
+     "tinfo_cplusplus";
 
 /*
  *  File name selection pattern
  */
-tSCC zSun_SignalList[] =
-  "sys/signal.h\0signal.h\0";
+tSCC zTinfo_CplusplusList[] =
+  "tinfo.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSun_SignalMachs (const char**)NULL
+#define apzTinfo_CplusplusMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSun_SignalSelect0[] =
-       "^void\t\\(\\*signal\\(\\)\\)\\(\\);.*";
+tSCC zTinfo_CplusplusSelect0[] =
+       "[ \t]_cplusplus";
 
-#define    SUN_SIGNAL_TEST_CT  1
-static tTestDesc aSun_SignalTests[] = {
-  { TT_EGREP,    zSun_SignalSelect0, (regex_t*)NULL }, };
+#define    TINFO_CPLUSPLUS_TEST_CT  1
+static tTestDesc aTinfo_CplusplusTests[] = {
+  { TT_EGREP,    zTinfo_CplusplusSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sun_Signal
+ *  Fix Command Arguments for Tinfo_Cplusplus
  */
-static const char* apzSun_SignalPatch[] = {
+static const char* apzTinfo_CplusplusPatch[] = {
     "format",
-    "#ifdef __cplusplus\n\
-void\t(*signal(...))(...);\n\
-#else\n\
-%0\n\
-#endif",
+    " __cplusplus",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sunos_Strlen fix
+ *  Description of Ultrix_Const fix
  */
-tSCC zSunos_StrlenName[] =
-     "sunos_strlen";
+tSCC zUltrix_ConstName[] =
+     "ultrix_const";
 
 /*
  *  File name selection pattern
  */
-tSCC zSunos_StrlenList[] =
-  "strings.h\0";
+tSCC zUltrix_ConstList[] =
+  "stdio.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSunos_StrlenMachs (const char**)NULL
+#define apzUltrix_ConstMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSunos_StrlenSelect0[] =
-       "int[ \t]*strlen\\(\\);(.*)";
+tSCC zUltrix_ConstSelect0[] =
+       "perror\\( char \\*";
 
-#define    SUNOS_STRLEN_TEST_CT  1
-static tTestDesc aSunos_StrlenTests[] = {
-  { TT_EGREP,    zSunos_StrlenSelect0, (regex_t*)NULL }, };
+#define    ULTRIX_CONST_TEST_CT  1
+static tTestDesc aUltrix_ConstTests[] = {
+  { TT_EGREP,    zUltrix_ConstSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sunos_Strlen
+ *  Fix Command Arguments for Ultrix_Const
  */
-static const char* apzSunos_StrlenPatch[] = {
+static const char* apzUltrix_ConstPatch[] = {
     "format",
-    "__SIZE_TYPE__ strlen();%1",
+    "%1 const %3 *__",
+    "([ \t*](perror|fputs|fwrite|scanf|fscanf)\\(.*)[ \t]+(char|void) \\*__",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Svr4_Disable_Opt fix
+ *  Description of Ultrix_Const2 fix
  */
-tSCC zSvr4_Disable_OptName[] =
-     "svr4_disable_opt";
+tSCC zUltrix_Const2Name[] =
+     "ultrix_const2";
 
 /*
  *  File name selection pattern
  */
-tSCC zSvr4_Disable_OptList[] =
-  "string.h\0";
+tSCC zUltrix_Const2List[] =
+  "stdio.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSvr4_Disable_OptMachs (const char**)NULL
+#define apzUltrix_Const2Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSvr4_Disable_OptSelect0[] =
-       "#define.*__std_hdr_";
+tSCC zUltrix_Const2Select0[] =
+       "\\*fopen\\( char \\*";
 
-#define    SVR4_DISABLE_OPT_TEST_CT  1
-static tTestDesc aSvr4_Disable_OptTests[] = {
-  { TT_EGREP,    zSvr4_Disable_OptSelect0, (regex_t*)NULL }, };
+#define    ULTRIX_CONST2_TEST_CT  1
+static tTestDesc aUltrix_Const2Tests[] = {
+  { TT_EGREP,    zUltrix_Const2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Svr4_Disable_Opt
+ *  Fix Command Arguments for Ultrix_Const2
  */
-static const char* apzSvr4_Disable_OptPatch[] = { sed_cmd_z,
-    "-e", "/#define.*__std_hdr_/d",
+static const char* apzUltrix_Const2Patch[] = {
+    "format",
+    "%1( const char *%3, const char *",
+    "([ \t*](fopen|sscanf|popen|tempnam))\\([ \t]*char[ \t]*\\*([^,]*),[ \t]*char[ \t]*\\*[ \t]*",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Svr4_Getcwd fix
+ *  Description of Va_I960_Macro fix
  */
-tSCC zSvr4_GetcwdName[] =
-     "svr4_getcwd";
+tSCC zVa_I960_MacroName[] =
+     "va_i960_macro";
 
 /*
  *  File name selection pattern
  */
-tSCC zSvr4_GetcwdList[] =
-  "stdlib.h\0unistd.h\0prototypes.h\0";
+tSCC zVa_I960_MacroList[] =
+  "arch/i960/archI960.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSvr4_GetcwdMachs (const char**)NULL
+#define apzVa_I960_MacroMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSvr4_GetcwdSelect0[] =
-       "getcwd\\(char \\*, int\\)";
+tSCC zVa_I960_MacroSelect0[] =
+       "__(vsiz|vali|vpad|alignof__)";
 
-#define    SVR4_GETCWD_TEST_CT  1
-static tTestDesc aSvr4_GetcwdTests[] = {
-  { TT_EGREP,    zSvr4_GetcwdSelect0, (regex_t*)NULL }, };
+#define    VA_I960_MACRO_TEST_CT  1
+static tTestDesc aVa_I960_MacroTests[] = {
+  { TT_EGREP,    zVa_I960_MacroSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Svr4_Getcwd
+ *  Fix Command Arguments for Va_I960_Macro
  */
-static const char* apzSvr4_GetcwdPatch[] = {
+static const char* apzVa_I960_MacroPatch[] = {
     "format",
-    "getcwd(char *, size_t)",
+    "__vx%1",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Svr4_Profil fix
+ *  Description of Vms_Add_Missing_Braces fix
  */
-tSCC zSvr4_ProfilName[] =
-     "svr4_profil";
+tSCC zVms_Add_Missing_BracesName[] =
+     "vms_add_missing_braces";
 
 /*
  *  File name selection pattern
  */
-tSCC zSvr4_ProfilList[] =
-  "stdlib.h\0unistd.h\0";
+tSCC zVms_Add_Missing_BracesList[] =
+  "rtldef/signal.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSvr4_ProfilMachs (const char**)NULL
+tSCC* apzVms_Add_Missing_BracesMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSvr4_ProfilSelect0[] =
-       "profil\\(unsigned short \\*, unsigned int, unsigned int, unsigned int\\)";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSvr4_ProfilBypass0[] =
-       "Silicon Graphics";
+tSCC zVms_Add_Missing_BracesSelect0[] =
+       "(_SIG_[A-Z]+_SET[ \t]+= \\{)(0x[0F]+, 0x[0F]+)";
 
-#define    SVR4_PROFIL_TEST_CT  2
-static tTestDesc aSvr4_ProfilTests[] = {
-  { TT_NEGREP,   zSvr4_ProfilBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSvr4_ProfilSelect0, (regex_t*)NULL }, };
+#define    VMS_ADD_MISSING_BRACES_TEST_CT  1
+static tTestDesc aVms_Add_Missing_BracesTests[] = {
+  { TT_EGREP,    zVms_Add_Missing_BracesSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Svr4_Profil
+ *  Fix Command Arguments for Vms_Add_Missing_Braces
  */
-static const char* apzSvr4_ProfilPatch[] = {
+static const char* apzVms_Add_Missing_BracesPatch[] = {
     "format",
-    "profil(unsigned short *, size_t, int, unsigned int)",
+    "%1 {%2} ",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Svr4_Sighandler_Type fix
+ *  Description of Vms_Decc_Builtin fix
  */
-tSCC zSvr4_Sighandler_TypeName[] =
-     "svr4_sighandler_type";
+tSCC zVms_Decc_BuiltinName[] =
+     "vms_decc_builtin";
 
 /*
  *  File name selection pattern
  */
-tSCC zSvr4_Sighandler_TypeList[] =
-  "sys/signal.h\0";
+tSCC zVms_Decc_BuiltinList[] =
+  "rtldef/string.h\0rtldef/time.h\0rtldef/strings.h\0rtldef/socket.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSvr4_Sighandler_TypeMachs (const char**)NULL
+tSCC* apzVms_Decc_BuiltinMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSvr4_Sighandler_TypeSelect0[] =
-       "void *\\(\\*\\)\\(\\)";
+tSCC zVms_Decc_BuiltinSelect0[] =
+       "(__MEMSET|__MEMMOVE|__MEMCPY|__STRLEN|__STRCPY)";
 
-#define    SVR4_SIGHANDLER_TYPE_TEST_CT  1
-static tTestDesc aSvr4_Sighandler_TypeTests[] = {
-  { TT_EGREP,    zSvr4_Sighandler_TypeSelect0, (regex_t*)NULL }, };
+#define    VMS_DECC_BUILTIN_TEST_CT  1
+static tTestDesc aVms_Decc_BuiltinTests[] = {
+  { TT_EGREP,    zVms_Decc_BuiltinSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Svr4_Sighandler_Type
+ *  Fix Command Arguments for Vms_Decc_Builtin
  */
-static const char* apzSvr4_Sighandler_TypePatch[] = {
-    "format",
-    "void (*)(int)",
+static const char* apzVms_Decc_BuiltinPatch[] = { sed_cmd_z,
+    "-e", "s@__MEMSET@memset@",
+    "-e", "s@__MEMMOVE@memmove@",
+    "-e", "s@__MEMCPY@memcpy@",
+    "-e", "s@__STRLEN@strlen@",
+    "-e", "s@__STRCPY@strcpy@",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Svr4_Undeclared_Getrnge fix
+ *  Description of Vms_Define_Can_Use_Extern_Prefix fix
  */
-tSCC zSvr4_Undeclared_GetrngeName[] =
-     "svr4_undeclared_getrnge";
+tSCC zVms_Define_Can_Use_Extern_PrefixName[] =
+     "vms_define_can_use_extern_prefix";
 
 /*
  *  File name selection pattern
  */
-tSCC zSvr4_Undeclared_GetrngeList[] =
-  "regexp.h\0";
+tSCC zVms_Define_Can_Use_Extern_PrefixList[] =
+  "rtldef/decc$types.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSvr4_Undeclared_GetrngeMachs (const char**)NULL
+tSCC* apzVms_Define_Can_Use_Extern_PrefixMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSvr4_Undeclared_GetrngeSelect0[] =
-       "getrnge";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSvr4_Undeclared_GetrngeBypass0[] =
-       "static void getrnge";
+tSCC zVms_Define_Can_Use_Extern_PrefixSelect0[] =
+       "#[ \t]*else\n\
+#[ \t]*if defined\\(__DECCXX\\)\n\
+#[ \t]*define __CAN_USE_EXTERN_PREFIX 1\n";
 
-#define    SVR4_UNDECLARED_GETRNGE_TEST_CT  2
-static tTestDesc aSvr4_Undeclared_GetrngeTests[] = {
-  { TT_NEGREP,   zSvr4_Undeclared_GetrngeBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSvr4_Undeclared_GetrngeSelect0, (regex_t*)NULL }, };
+#define    VMS_DEFINE_CAN_USE_EXTERN_PREFIX_TEST_CT  1
+static tTestDesc aVms_Define_Can_Use_Extern_PrefixTests[] = {
+  { TT_EGREP,    zVms_Define_Can_Use_Extern_PrefixSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Svr4_Undeclared_Getrnge
+ *  Fix Command Arguments for Vms_Define_Can_Use_Extern_Prefix
  */
-static const char* apzSvr4_Undeclared_GetrngePatch[] = {
+static const char* apzVms_Define_Can_Use_Extern_PrefixPatch[] = {
     "format",
-    "%0\n\
-static int getrnge ();",
-    "^static int[ \t]+size;",
+    "%0#    elif defined (__GNUC__)\n\
+#\tdefine __CAN_USE_EXTERN_PREFIX 1\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sysv68_String fix
+ *  Description of Vms_Disable_Decc_String_Builtins fix
  */
-tSCC zSysv68_StringName[] =
-     "sysv68_string";
+tSCC zVms_Disable_Decc_String_BuiltinsName[] =
+     "vms_disable_decc_string_builtins";
 
 /*
  *  File name selection pattern
  */
-tSCC zSysv68_StringList[] =
-  "testing.h\0string.h\0";
+tSCC zVms_Disable_Decc_String_BuiltinsList[] =
+  "rtldef/string.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSysv68_StringMachs (const char**)NULL
+tSCC* apzVms_Disable_Decc_String_BuiltinsMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
 
 /*
- *  content bypass pattern - skip fix if pattern found
+ *  content selection pattern - do fix if pattern found
  */
-tSCC zSysv68_StringBypass0[] =
-       "_CLASSIC_ANSI_TYPES";
+tSCC zVms_Disable_Decc_String_BuiltinsSelect0[] =
+       "#if !defined\\(__VAX\\)\n";
 
-#define    SYSV68_STRING_TEST_CT  1
-static tTestDesc aSysv68_StringTests[] = {
-  { TT_NEGREP,   zSysv68_StringBypass0, (regex_t*)NULL }, };
+#define    VMS_DISABLE_DECC_STRING_BUILTINS_TEST_CT  1
+static tTestDesc aVms_Disable_Decc_String_BuiltinsTests[] = {
+  { TT_EGREP,    zVms_Disable_Decc_String_BuiltinsSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sysv68_String
+ *  Fix Command Arguments for Vms_Disable_Decc_String_Builtins
  */
-static const char* apzSysv68_StringPatch[] = { sed_cmd_z,
-    "-e", "s/extern[ \t]*int[ \t]*strlen();/extern unsigned int strlen();/",
-    "-e", "s/extern[ \t]*int[ \t]*ffs[ \t]*(long);/extern int ffs(int);/",
-    "-e", "s/strdup(char \\*s1);/strdup(const char *s1);/",
-    "-e", "/^extern char$/N",
-    "-e", "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/",
-    "-e", "/^extern int$/N",
-    "-e", "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/",
-    "-e", "/^\tstrncmp(),$/N",
-    "-e", "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n\
-extern unsigned int\\\n\
-\\2/",
+static const char* apzVms_Disable_Decc_String_BuiltinsPatch[] = {
+    "format",
+    "#if !defined(__VAX) && !defined(__GNUC__)\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sysz_Stdlib_For_Sun fix
+ *  Description of Vms_Do_Not_Redeclare_Hostalias fix
  */
-tSCC zSysz_Stdlib_For_SunName[] =
-     "sysz_stdlib_for_sun";
+tSCC zVms_Do_Not_Redeclare_HostaliasName[] =
+     "vms_do_not_redeclare_hostalias";
 
 /*
  *  File name selection pattern
  */
-tSCC zSysz_Stdlib_For_SunList[] =
-  "stdlib.h\0";
+tSCC zVms_Do_Not_Redeclare_HostaliasList[] =
+  "rtldef/resolv.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSysz_Stdlib_For_SunMachs (const char**)NULL
+tSCC* apzVms_Do_Not_Redeclare_HostaliasMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSysz_Stdlib_For_SunSelect0[] =
-       "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\(";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSysz_Stdlib_For_SunBypass0[] =
-       "_CLASSIC_ANSI_TYPES";
+tSCC zVms_Do_Not_Redeclare_HostaliasSelect0[] =
+       "(void[ \t]+fp_nquery \\(const u_char \\*, int, FILE \\*\\);)\n\
+(__char_ptr32[ \t]+hostalias \\(const char \\*\\);)";
 
-#define    SYSZ_STDLIB_FOR_SUN_TEST_CT  2
-static tTestDesc aSysz_Stdlib_For_SunTests[] = {
-  { TT_NEGREP,   zSysz_Stdlib_For_SunBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSysz_Stdlib_For_SunSelect0, (regex_t*)NULL }, };
+#define    VMS_DO_NOT_REDECLARE_HOSTALIAS_TEST_CT  1
+static tTestDesc aVms_Do_Not_Redeclare_HostaliasTests[] = {
+  { TT_EGREP,    zVms_Do_Not_Redeclare_HostaliasSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sysz_Stdlib_For_Sun
+ *  Fix Command Arguments for Vms_Do_Not_Redeclare_Hostalias
  */
-static const char* apzSysz_Stdlib_For_SunPatch[] = {
+static const char* apzVms_Do_Not_Redeclare_HostaliasPatch[] = {
     "format",
-    "void *\t%1(",
+    "%1\n\
+/* %2 */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Thread_Keyword fix
+ *  Description of Vms_Forward_Declare_Struct fix
  */
-tSCC zThread_KeywordName[] =
-     "thread_keyword";
+tSCC zVms_Forward_Declare_StructName[] =
+     "vms_forward_declare_struct";
 
 /*
  *  File name selection pattern
  */
-tSCC zThread_KeywordList[] =
-  "pthread.h\0bits/sigthread.h\0";
+tSCC zVms_Forward_Declare_StructList[] =
+  "rtldef/if.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzThread_KeywordMachs (const char**)NULL
+tSCC* apzVms_Forward_Declare_StructMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zThread_KeywordSelect0[] =
-       "([* ])__thread([,)])";
+tSCC zVms_Forward_Declare_StructSelect0[] =
+       "(/\\* forward decls for C\\+\\+ \\*/\n\
+)#ifdef __cplusplus\n";
 
-#define    THREAD_KEYWORD_TEST_CT  1
-static tTestDesc aThread_KeywordTests[] = {
-  { TT_EGREP,    zThread_KeywordSelect0, (regex_t*)NULL }, };
+#define    VMS_FORWARD_DECLARE_STRUCT_TEST_CT  1
+static tTestDesc aVms_Forward_Declare_StructTests[] = {
+  { TT_EGREP,    zVms_Forward_Declare_StructSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Thread_Keyword
+ *  Fix Command Arguments for Vms_Forward_Declare_Struct
  */
-static const char* apzThread_KeywordPatch[] = {
+static const char* apzVms_Forward_Declare_StructPatch[] = {
     "format",
-    "%1__thr%2",
+    "%1#if defined (__cplusplus) || defined (__GNUC__)\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Tinfo_Cplusplus fix
+ *  Description of Vms_No_64bit_Getopt fix
  */
-tSCC zTinfo_CplusplusName[] =
-     "tinfo_cplusplus";
+tSCC zVms_No_64bit_GetoptName[] =
+     "vms_no_64bit_getopt";
 
 /*
  *  File name selection pattern
  */
-tSCC zTinfo_CplusplusList[] =
-  "tinfo.h\0";
+tSCC zVms_No_64bit_GetoptList[] =
+  "rtldef/stdio.h\0rtldef/unistd.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzTinfo_CplusplusMachs (const char**)NULL
+tSCC* apzVms_No_64bit_GetoptMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zTinfo_CplusplusSelect0[] =
-       "[ \t]_cplusplus";
+tSCC zVms_No_64bit_GetoptSelect0[] =
+       "^[ \t]*(extern[ \t]*)?(int[ \t]*(getopt|optind|opterr|optopt)|(char \\*optarg))([ \t]*\\(.*\\))?;\n";
 
-#define    TINFO_CPLUSPLUS_TEST_CT  1
-static tTestDesc aTinfo_CplusplusTests[] = {
-  { TT_EGREP,    zTinfo_CplusplusSelect0, (regex_t*)NULL }, };
+#define    VMS_NO_64BIT_GETOPT_TEST_CT  1
+static tTestDesc aVms_No_64bit_GetoptTests[] = {
+  { TT_EGREP,    zVms_No_64bit_GetoptSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Tinfo_Cplusplus
+ *  Fix Command Arguments for Vms_No_64bit_Getopt
  */
-static const char* apzTinfo_CplusplusPatch[] = {
+static const char* apzVms_No_64bit_GetoptPatch[] = {
     "format",
-    " __cplusplus",
+    "#if __INITIAL_POINTER_SIZE != 64 /* getopt is short ptr only.  */\n\
+%0#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Ultrix_Const fix
+ *  Description of Vms_Use_Fast_Setjmp fix
  */
-tSCC zUltrix_ConstName[] =
-     "ultrix_const";
+tSCC zVms_Use_Fast_SetjmpName[] =
+     "vms_use_fast_setjmp";
 
 /*
  *  File name selection pattern
  */
-tSCC zUltrix_ConstList[] =
-  "stdio.h\0";
+tSCC zVms_Use_Fast_SetjmpList[] =
+  "rtldef/setjmp.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzUltrix_ConstMachs (const char**)NULL
+tSCC* apzVms_Use_Fast_SetjmpMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zUltrix_ConstSelect0[] =
-       "perror\\( char \\*";
+tSCC zVms_Use_Fast_SetjmpSelect0[] =
+       "(#[ \t]*if[ \t]*defined\\(__FAST_SETJMP\\)[ \t]*\\|\\|)";
 
-#define    ULTRIX_CONST_TEST_CT  1
-static tTestDesc aUltrix_ConstTests[] = {
-  { TT_EGREP,    zUltrix_ConstSelect0, (regex_t*)NULL }, };
+#define    VMS_USE_FAST_SETJMP_TEST_CT  1
+static tTestDesc aVms_Use_Fast_SetjmpTests[] = {
+  { TT_EGREP,    zVms_Use_Fast_SetjmpSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Ultrix_Const
+ *  Fix Command Arguments for Vms_Use_Fast_Setjmp
  */
-static const char* apzUltrix_ConstPatch[] = {
+static const char* apzVms_Use_Fast_SetjmpPatch[] = {
     "format",
-    "%1 const %3 *__",
-    "([ \t*](perror|fputs|fwrite|scanf|fscanf)\\(.*)[ \t]+(char|void) \\*__",
+    "%0 defined (__GNUC__) ||",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Ultrix_Const2 fix
+ *  Description of Vms_Use_Pragma_Extern_Model fix
  */
-tSCC zUltrix_Const2Name[] =
-     "ultrix_const2";
+tSCC zVms_Use_Pragma_Extern_ModelName[] =
+     "vms_use_pragma_extern_model";
 
 /*
  *  File name selection pattern
  */
-tSCC zUltrix_Const2List[] =
-  "stdio.h\0";
+#define zVms_Use_Pragma_Extern_ModelList (char*)NULL
 /*
  *  Machine/OS name selection pattern
  */
-#define apzUltrix_Const2Machs (const char**)NULL
+tSCC* apzVms_Use_Pragma_Extern_ModelMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zUltrix_Const2Select0[] =
-       "\\*fopen\\( char \\*";
+tSCC zVms_Use_Pragma_Extern_ModelSelect0[] =
+       "#if defined\\(__DECC\\) \\|\\| defined\\(__DECCXX\\)\n\
+# pragma extern_model __save\n";
 
-#define    ULTRIX_CONST2_TEST_CT  1
-static tTestDesc aUltrix_Const2Tests[] = {
-  { TT_EGREP,    zUltrix_Const2Select0, (regex_t*)NULL }, };
+#define    VMS_USE_PRAGMA_EXTERN_MODEL_TEST_CT  1
+static tTestDesc aVms_Use_Pragma_Extern_ModelTests[] = {
+  { TT_EGREP,    zVms_Use_Pragma_Extern_ModelSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Ultrix_Const2
+ *  Fix Command Arguments for Vms_Use_Pragma_Extern_Model
  */
-static const char* apzUltrix_Const2Patch[] = {
+static const char* apzVms_Use_Pragma_Extern_ModelPatch[] = {
     "format",
-    "%1( const char *%3, const char *",
-    "([ \t*](fopen|sscanf|popen|tempnam))\\([ \t]*char[ \t]*\\*([^,]*),[ \t]*char[ \t]*\\*[ \t]*",
+    "#if defined(__DECC) || defined(__DECCXX) || defined(__GNUC__)\n\
+# pragma extern_model __save\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Va_I960_Macro fix
+ *  Description of Vms_Use_Quoted_Include fix
  */
-tSCC zVa_I960_MacroName[] =
-     "va_i960_macro";
+tSCC zVms_Use_Quoted_IncludeName[] =
+     "vms_use_quoted_include";
 
 /*
  *  File name selection pattern
  */
-tSCC zVa_I960_MacroList[] =
-  "arch/i960/archI960.h\0";
+tSCC zVms_Use_Quoted_IncludeList[] =
+  "rtldef/wait.h\0starlet_c/pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzVa_I960_MacroMachs (const char**)NULL
+tSCC* apzVms_Use_Quoted_IncludeMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zVa_I960_MacroSelect0[] =
-       "__(vsiz|vali|vpad|alignof__)";
+tSCC zVms_Use_Quoted_IncludeSelect0[] =
+       "(#[ \t]*include[ \t]+)<(resource|builtins)\\.h>";
 
-#define    VA_I960_MACRO_TEST_CT  1
-static tTestDesc aVa_I960_MacroTests[] = {
-  { TT_EGREP,    zVa_I960_MacroSelect0, (regex_t*)NULL }, };
+#define    VMS_USE_QUOTED_INCLUDE_TEST_CT  1
+static tTestDesc aVms_Use_Quoted_IncludeTests[] = {
+  { TT_EGREP,    zVms_Use_Quoted_IncludeSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Va_I960_Macro
+ *  Fix Command Arguments for Vms_Use_Quoted_Include
  */
-static const char* apzVa_I960_MacroPatch[] = {
+static const char* apzVms_Use_Quoted_IncludePatch[] = {
     "format",
-    "__vx%1",
+    "%1<sys/%2.h>",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -8186,10 +9634,13 @@ tSCC zVoid_NullSelect0[] =
  */
 tSCC zVoid_NullBypass0[] =
        "__cplusplus";
+tSCC zVoid_NullBypass1[] =
+       "__null";
 
-#define    VOID_NULL_TEST_CT  2
+#define    VOID_NULL_TEST_CT  3
 static tTestDesc aVoid_NullTests[] = {
   { TT_NEGREP,   zVoid_NullBypass0, (regex_t*)NULL },
+  { TT_NEGREP,   zVoid_NullBypass1, (regex_t*)NULL },
   { TT_EGREP,    zVoid_NullSelect0, (regex_t*)NULL }, };
 
 /*
@@ -8197,7 +9648,17 @@ static tTestDesc aVoid_NullTests[] = {
  */
 static const char* apzVoid_NullPatch[] = {
     "format",
-    "#define NULL 0",
+    "#ifndef NULL\n\
+#ifdef __cplusplus\n\
+#ifdef __GNUG__\n\
+#define NULL __null\n\
+#else /* ! __GNUG__  */\n\
+#define NULL 0L\n\
+#endif /* __GNUG__  */\n\
+#else /* ! __cplusplus  */\n\
+#define NULL ((void *)0)\n\
+#endif /* __cplusplus  */\n\
+#endif /* !NULL  */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -8249,6 +9710,68 @@ static const char* apzVxworks_Gcc_ProblemPatch[] = { sed_cmd_z,
 #endif\n",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vxworks_Ioctl_Macro fix
+ */
+tSCC zVxworks_Ioctl_MacroName[] =
+     "vxworks_ioctl_macro";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVxworks_Ioctl_MacroList[] =
+  "ioLib.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVxworks_Ioctl_MacroMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
+#define VXWORKS_IOCTL_MACRO_TEST_CT  0
+#define aVxworks_Ioctl_MacroTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Vxworks_Ioctl_Macro
+ */
+static const char* apzVxworks_Ioctl_MacroPatch[] = {
+    "format",
+    "%0\n\
+#define ioctl(fd, func, arg) (ioctl)(fd, func, (int)(arg))\n",
+    "extern[\t ]+int[\t ]+ioctl[\t ]*\\([\t ,[:alnum:]]*\\);",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vxworks_Mkdir_Macro fix
+ */
+tSCC zVxworks_Mkdir_MacroName[] =
+     "vxworks_mkdir_macro";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVxworks_Mkdir_MacroList[] =
+  "sys/stat.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVxworks_Mkdir_MacroMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
+#define VXWORKS_MKDIR_MACRO_TEST_CT  0
+#define aVxworks_Mkdir_MacroTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Vxworks_Mkdir_Macro
+ */
+static const char* apzVxworks_Mkdir_MacroPatch[] = {
+    "format",
+    "%0\n\
+#define mkdir(dir, ...) ((void)0, ##__VA_ARGS__, (mkdir)(dir))\n",
+    "extern[\t ]+STATUS[\t ]+mkdir[\t ]*\\([\t ]*const[\t ]+char[\t ]*\\*[\t ]*(|[_[:alpha:]][_[:alnum:]]*)\\)[\t ]*;",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Vxworks_Needs_Vxtypes fix
@@ -8332,6 +9855,42 @@ static const char* apzVxworks_Needs_VxworksPatch[] = { sed_cmd_z,
 #include <types/vxTypesOld.h>\n",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vxworks_Regs fix
+ */
+tSCC zVxworks_RegsName[] =
+     "vxworks_regs";
+
+/*
+ *  File name selection pattern
+ */
+#define zVxworks_RegsList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVxworks_RegsMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zVxworks_RegsSelect0[] =
+       "#[\t ]*include[\t ]+[<\"]regs.h[>\"]";
+
+#define    VXWORKS_REGS_TEST_CT  1
+static tTestDesc aVxworks_RegsTests[] = {
+  { TT_EGREP,    zVxworks_RegsSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Vxworks_Regs
+ */
+static const char* apzVxworks_RegsPatch[] = {
+    "format",
+    "#include <arch/../regs.h>",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Vxworks_Time fix
@@ -8347,39 +9906,106 @@ tSCC zVxworks_TimeList[] =
 /*
  *  Machine/OS name selection pattern
  */
-#define apzVxworks_TimeMachs (const char**)NULL
+#define apzVxworks_TimeMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zVxworks_TimeSelect0[] =
+       "#[ \t]*define[ \t]+VOIDFUNCPTR[ \t].*";
+
+/*
+ *  perform the 'test' shell command - do fix on success
+ */
+tSCC zVxworks_TimeTest0[] =
+       " -r vxWorks.h";
+
+#define    VXWORKS_TIME_TEST_CT  2
+static tTestDesc aVxworks_TimeTests[] = {
+  { TT_TEST,     zVxworks_TimeTest0,   0 /* unused */ },
+  { TT_EGREP,    zVxworks_TimeSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Vxworks_Time
+ */
+static const char* apzVxworks_TimePatch[] = {
+    "format",
+    "#ifndef __gcc_VOIDFUNCPTR_defined\n\
+#ifdef __cplusplus\n\
+typedef void (*__gcc_VOIDFUNCPTR) (...);\n\
+#else\n\
+typedef void (*__gcc_VOIDFUNCPTR) ();\n\
+#endif\n\
+#define __gcc_VOIDFUNCPTR_defined\n\
+#endif\n\
+#define VOIDFUNCPTR __gcc_VOIDFUNCPTR",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vxworks_Write_Const fix
+ */
+tSCC zVxworks_Write_ConstName[] =
+     "vxworks_write_const";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVxworks_Write_ConstList[] =
+  "ioLib.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVxworks_Write_ConstMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
+#define VXWORKS_WRITE_CONST_TEST_CT  0
+#define aVxworks_Write_ConstTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Vxworks_Write_Const
+ */
+static const char* apzVxworks_Write_ConstPatch[] = {
+    "format",
+    "extern int  write (int, const char*, size_t);",
+    "extern[\t ]+int[\t ]+write[\t ]*\\([\t ]*int[\t ]*,[\t ]*char[\t ]*\\*[\t ]*,[\t ]*size_t[\t ]*\\)[\t ]*;",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Vxworks_Iolib_Include_Unistd fix
+ */
+tSCC zVxworks_Iolib_Include_UnistdName[] =
+     "vxworks_iolib_include_unistd";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zVxworks_Iolib_Include_UnistdList[] =
+  "ioLib.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzVxworks_Iolib_Include_UnistdMachs[] = {
+        "*-*-vxworks*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zVxworks_TimeSelect0[] =
-       "#[ \t]*define[ \t]+VOIDFUNCPTR[ \t].*";
-
-/*
- *  perform the 'test' shell command - do fix on success
- */
-tSCC zVxworks_TimeTest0[] =
-       " -r vxWorks.h";
+tSCC zVxworks_Iolib_Include_UnistdSelect0[] =
+       "#include \"unistd.h\"";
 
-#define    VXWORKS_TIME_TEST_CT  2
-static tTestDesc aVxworks_TimeTests[] = {
-  { TT_TEST,     zVxworks_TimeTest0,   0 /* unused */ },
-  { TT_EGREP,    zVxworks_TimeSelect0, (regex_t*)NULL }, };
+#define    VXWORKS_IOLIB_INCLUDE_UNISTD_TEST_CT  1
+static tTestDesc aVxworks_Iolib_Include_UnistdTests[] = {
+  { TT_EGREP,    zVxworks_Iolib_Include_UnistdSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Vxworks_Time
+ *  Fix Command Arguments for Vxworks_Iolib_Include_Unistd
  */
-static const char* apzVxworks_TimePatch[] = {
+static const char* apzVxworks_Iolib_Include_UnistdPatch[] = {
     "format",
-    "#ifndef __gcc_VOIDFUNCPTR_defined\n\
-#ifdef __cplusplus\n\
-typedef void (*__gcc_VOIDFUNCPTR) (...);\n\
-#else\n\
-typedef void (*__gcc_VOIDFUNCPTR) ();\n\
-#endif\n\
-#define __gcc_VOIDFUNCPTR_defined\n\
-#endif\n\
-#define VOIDFUNCPTR __gcc_VOIDFUNCPTR",
+    "#include <unistd.h>",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -8552,44 +10178,61 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          249
-#define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT            210
+#define REGEX_COUNT          289
+#define MACH_LIST_SIZE_LIMIT 187
+#define FIX_COUNT            251
 
 /*
  *  Enumerate the fixes
  */
 typedef enum {
     AAB_AIX_STDIO_FIXIDX,
+    AAB_AIX_FCNTL_FIXIDX,
     AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_FIXIDX,
-    AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_FIXIDX,
     AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX,
     AAB_FD_ZERO_GNU_TYPES_H_FIXIDX,
     AAB_FD_ZERO_SELECTBITS_H_FIXIDX,
     AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
     AAB_SUN_MEMCPY_FIXIDX,
+    AAB_VXWORKS_ASSERT_FIXIDX,
+    AAB_VXWORKS_REGS_VXTYPES_FIXIDX,
+    AAB_VXWORKS_UNISTD_FIXIDX,
+    AIX_ASSERT_FIXIDX,
     AIX_COMPLEX_FIXIDX,
+    AIX_EXTERNC_FIXIDX,
+    AIX_EXTERNCPP1_FIXIDX,
+    AIX_EXTERNCPP2_FIXIDX,
+    AIX_MALLOC_FIXIDX,
+    AIX_NET_IF_ARP_FIXIDX,
+    AIX_NULL_FIXIDX,
+    AIX_ONCE_INIT_1_FIXIDX,
+    AIX_ONCE_INIT_2_FIXIDX,
+    AIX_MUTEX_INITIALIZER_1_FIXIDX,
+    AIX_COND_INITIALIZER_1_FIXIDX,
+    AIX_RWLOCK_INITIALIZER_1_FIXIDX,
     AIX_PTHREAD_FIXIDX,
     AIX_STDINT_1_FIXIDX,
     AIX_STDINT_2_FIXIDX,
     AIX_STDINT_3_FIXIDX,
     AIX_STDINT_4_FIXIDX,
     AIX_STDINT_5_FIXIDX,
+    AIX_STDIO_INLINE_FIXIDX,
+    AIX_STDLIB_MALLOC_FIXIDX,
+    AIX_STDLIB_REALLOC_FIXIDX,
+    AIX_STDLIB_CALLOC_FIXIDX,
+    AIX_STDLIB_VALLOC_FIXIDX,
+    AIX_STDLIB_VEC_MALLOC_FIXIDX,
+    AIX_STDLIB_VEC_CALLOC_FIXIDX,
+    AIX_STRTOF_CONST_FIXIDX,
     AIX_SYSMACHINE_FIXIDX,
     AIX_SYSWAIT_2_FIXIDX,
     AIX_VOLATILE_FIXIDX,
+    AIX_UNISTD_FIXIDX,
     ALPHA___ASSERT_FIXIDX,
-    ALPHA___EXTERN_PREFIX_FIXIDX,
-    ALPHA___EXTERN_PREFIX_STANDARDS_FIXIDX,
-    ALPHA___EXTERN_PREFIX_SYS_STAT_FIXIDX,
     ALPHA_ASSERT_FIXIDX,
-    ALPHA_BAD_LVAL_FIXIDX,
     ALPHA_GETOPT_FIXIDX,
     ALPHA_IF_SEMICOLON_FIXIDX,
     ALPHA_PARENS_FIXIDX,
-    ALPHA_PTHREAD_FIXIDX,
-    ALPHA_PTHREAD_GCC_FIXIDX,
-    ALPHA_PTHREAD_INIT_FIXIDX,
     ALPHA_SBRK_FIXIDX,
     AVOID_BOOL_DEFINE_FIXIDX,
     AVOID_BOOL_TYPE_FIXIDX,
@@ -8604,8 +10247,14 @@ typedef enum {
     CTRL_QUOTES_DEF_FIXIDX,
     CTRL_QUOTES_USE_FIXIDX,
     CXX_UNREADY_FIXIDX,
+    DARWIN_AVAILABILITYINTERNAL_FIXIDX,
+    DARWIN_9_LONG_DOUBLE_FUNCS_2_FIXIDX,
     DARWIN_EXTERNC_FIXIDX,
     DARWIN_GCC4_BREAKAGE_FIXIDX,
+    DARWIN_LONGJMP_NORETURN_FIXIDX,
+    DARWIN_OS_TRACE_1_FIXIDX,
+    DARWIN_OS_TRACE_2_FIXIDX,
+    DARWIN_OS_TRACE_3_FIXIDX,
     DARWIN_PRIVATE_EXTERN_FIXIDX,
     DARWIN_STDINT_1_FIXIDX,
     DARWIN_STDINT_2_FIXIDX,
@@ -8617,6 +10266,8 @@ typedef enum {
     DEC_INTERN_ASM_FIXIDX,
     DJGPP_WCHAR_H_FIXIDX,
     ECD_CURSOR_FIXIDX,
+    FERAISEEXCEPT_NOSSE_DIVBYZERO_FIXIDX,
+    FERAISEEXCEPT_NOSSE_INVALID_FIXIDX,
     FREEBSD_GCC3_BREAKAGE_FIXIDX,
     FREEBSD_GCC4_BREAKAGE_FIXIDX,
     GLIBC_C99_INLINE_1_FIXIDX,
@@ -8637,29 +10288,34 @@ typedef enum {
     HPUX10_CTYPE_DECLARATIONS1_FIXIDX,
     HPUX10_CTYPE_DECLARATIONS2_FIXIDX,
     HPUX10_STDIO_DECLARATIONS_FIXIDX,
+    HPPA_HPUX11_ALLOCA_FIXIDX,
     HPUX11_ABS_FIXIDX,
+    HPUX11_LWP_RWLOCK_VALID_FIXIDX,
+    HPUX11_EXTERN_SENDFILE_FIXIDX,
+    HPUX11_EXTERN_SENDPATH_FIXIDX,
     HPUX11_FABSF_FIXIDX,
+    HPUX11_PTHREAD_POINTER_FIXIDX,
     HPUX11_PTHREAD_CONST_FIXIDX,
     HPUX11_SIZE_T_FIXIDX,
     HPUX11_SNPRINTF_FIXIDX,
     HPUX11_VSNPRINTF_FIXIDX,
+    HPUX_VSSCANF_FIXIDX,
     HPUX8_BOGUS_INLINES_FIXIDX,
+    HPUX_C99_INTPTR_FIXIDX,
+    HPUX_C99_INTTYPES_FIXIDX,
+    HPUX_C99_INTTYPES2_FIXIDX,
     HPUX_CTYPE_MACROS_FIXIDX,
+    HPUX_EXTERN_ERRNO_FIXIDX,
     HPUX_HTONL_FIXIDX,
+    HPUX_IMAGINARY_I_FIXIDX,
+    HPUX_INTTYPE_INT8_T_FIXIDX,
     HPUX_LONG_DOUBLE_FIXIDX,
     HPUX_LONG_DOUBLE_2_FIXIDX,
-    HPUX_SYSTIME_FIXIDX,
-    HPUX_SPU_INFO_FIXIDX,
-    HPUX11_EXTERN_SENDFILE_FIXIDX,
-    HPUX11_EXTERN_SENDPATH_FIXIDX,
-    HPUX_EXTERN_ERRNO_FIXIDX,
     HPUX_PTHREAD_INITIALIZERS_FIXIDX,
-    HPUX_C99_INTPTR_FIXIDX,
-    HPUX_C99_INTTYPES_FIXIDX,
-    HPUX_C99_INTTYPES2_FIXIDX,
+    HPUX_SPU_INFO_FIXIDX,
     HPUX_STDINT_LEAST_FAST_FIXIDX,
-    HPUX_INTTYPE_INT8_T_FIXIDX,
-    HPUX_IMAGINARY_I_FIXIDX,
+    HPUX_LONGJMP_FIXIDX,
+    HPUX_SYSTIME_FIXIDX,
     HUGE_VAL_HEX_FIXIDX,
     HUGE_VALF_HEX_FIXIDX,
     HUGE_VALL_HEX_FIXIDX,
@@ -8667,19 +10323,8 @@ typedef enum {
     IO_QUOTES_DEF_FIXIDX,
     IO_QUOTES_USE_FIXIDX,
     IP_MISSING_SEMI_FIXIDX,
-    IRIX___RESTRICT_FIXIDX,
-    IRIX___GENERIC1_FIXIDX,
-    IRIX___GENERIC2_FIXIDX,
-    IRIX_ASM_APOSTROPHE_FIXIDX,
-    IRIX_COMPLEX_FIXIDX,
     IRIX_LIMITS_CONST_FIXIDX,
-    IRIX_PTHREAD_INIT_FIXIDX,
-    IRIX_SOCKLEN_T_FIXIDX,
-    IRIX_STDINT_C99_MODE_FIXIDX,
-    IRIX_STDINT_C99_TYPES_FIXIDX,
-    IRIX_STDINT_C99_MACROS_FIXIDX,
     IRIX_STDIO_VA_LIST_FIXIDX,
-    IRIX_WCSFTIME_FIXIDX,
     KANDR_CONCAT_FIXIDX,
     LINUX_IA64_UCONTEXT_FIXIDX,
     LYNXOS_NO_WARNING_IN_SYS_TIME_H_FIXIDX,
@@ -8714,25 +10359,31 @@ typedef enum {
     SOLARIS___RESTRICT_FIXIDX,
     SOLARIS_COMPLEX_FIXIDX,
     SOLARIS_COMPLEX_CXX_FIXIDX,
-    SOLARIS_COND_INIT_FIXIDX,
+    SOLARIS_CXX_LINKAGE_FIXIDX,
+    SOLARIS_GETC_STRICT_STDC_FIXIDX,
+    SOLARIS_GETS_C11_FIXIDX,
+    SOLARIS_GETS_CXX14_FIXIDX,
+    SOLARIS_INT_CONST_FIXIDX,
+    SOLARIS_INT_LIMITS_1_FIXIDX,
+    SOLARIS_INT_LIMITS_2_FIXIDX,
+    SOLARIS_INT_LIMITS_3_FIXIDX,
     SOLARIS_MATH_1_FIXIDX,
+    SOLARIS_MATH_10_FIXIDX,
     SOLARIS_MATH_2_FIXIDX,
     SOLARIS_MATH_3_FIXIDX,
     SOLARIS_MATH_4_FIXIDX,
     SOLARIS_MATH_8_FIXIDX,
     SOLARIS_MATH_9_FIXIDX,
-    SOLARIS_MATH_10_FIXIDX,
-    SOLARIS_MUTEX_INIT_2_FIXIDX,
-    SOLARIS_RWLOCK_INIT_1_FIXIDX,
+    SOLARIS_MATH_11_FIXIDX,
+    SOLARIS_MATH_12_FIXIDX,
     SOLARIS_ONCE_INIT_1_FIXIDX,
-    SOLARIS_ONCE_INIT_2_FIXIDX,
-    SOLARIS_INT_CONST_FIXIDX,
-    SOLARIS_INT_LIMITS_1_FIXIDX,
-    SOLARIS_INT_LIMITS_2_FIXIDX,
-    SOLARIS_INT_LIMITS_3_FIXIDX,
-    SOLARIS_INT_TYPES_FIXIDX,
+    SOLARIS_POSIX_SPAWN_RESTRICT_FIXIDX,
+    SOLARIS_POW_INT_OVERLOAD_FIXIDX,
+    SOLARIS_RWLOCK_INIT_1_FIXIDX,
+    SOLARIS_STD___FILBUF_FIXIDX,
+    SOLARIS_STD_GETS_CXX14_FIXIDX,
     SOLARIS_STDIO_TAG_FIXIDX,
-    SOLARIS_SYS_VA_LIST_FIXIDX,
+    SOLARIS_STDLIB_NORETURN_FIXIDX,
     STATSSWTCH_FIXIDX,
     STDIO_STDARG_H_FIXIDX,
     STDIO_VA_LIST_FIXIDX,
@@ -8749,6 +10400,7 @@ typedef enum {
     SUN_RUSERS_SEMI_FIXIDX,
     SUN_SIGNAL_FIXIDX,
     SUNOS_STRLEN_FIXIDX,
+    SUSE_LINUX_VT_CXX_FIXIDX,
     SVR4_DISABLE_OPT_FIXIDX,
     SVR4_GETCWD_FIXIDX,
     SVR4_PROFIL_FIXIDX,
@@ -8761,11 +10413,26 @@ typedef enum {
     ULTRIX_CONST_FIXIDX,
     ULTRIX_CONST2_FIXIDX,
     VA_I960_MACRO_FIXIDX,
+    VMS_ADD_MISSING_BRACES_FIXIDX,
+    VMS_DECC_BUILTIN_FIXIDX,
+    VMS_DEFINE_CAN_USE_EXTERN_PREFIX_FIXIDX,
+    VMS_DISABLE_DECC_STRING_BUILTINS_FIXIDX,
+    VMS_DO_NOT_REDECLARE_HOSTALIAS_FIXIDX,
+    VMS_FORWARD_DECLARE_STRUCT_FIXIDX,
+    VMS_NO_64BIT_GETOPT_FIXIDX,
+    VMS_USE_FAST_SETJMP_FIXIDX,
+    VMS_USE_PRAGMA_EXTERN_MODEL_FIXIDX,
+    VMS_USE_QUOTED_INCLUDE_FIXIDX,
     VOID_NULL_FIXIDX,
     VXWORKS_GCC_PROBLEM_FIXIDX,
+    VXWORKS_IOCTL_MACRO_FIXIDX,
+    VXWORKS_MKDIR_MACRO_FIXIDX,
     VXWORKS_NEEDS_VXTYPES_FIXIDX,
     VXWORKS_NEEDS_VXWORKS_FIXIDX,
+    VXWORKS_REGS_FIXIDX,
     VXWORKS_TIME_FIXIDX,
+    VXWORKS_WRITE_CONST_FIXIDX,
+    VXWORKS_IOLIB_INCLUDE_UNISTD_FIXIDX,
     X11_CLASS_FIXIDX,
     X11_CLASS_USAGE_FIXIDX,
     X11_NEW_FIXIDX,
@@ -8778,16 +10445,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AAB_AIX_STDIO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAab_Aix_StdioTests,   apzAab_Aix_StdioPatch, 0 },
 
+  {  zAab_Aix_FcntlName,    zAab_Aix_FcntlList,
+     apzAab_Aix_FcntlMachs,
+     AAB_AIX_FCNTL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAab_Aix_FcntlTests,   apzAab_Aix_FcntlPatch, 0 },
+
   {  zAab_Darwin7_9_Long_Double_FuncsName,    zAab_Darwin7_9_Long_Double_FuncsList,
      apzAab_Darwin7_9_Long_Double_FuncsMachs,
      AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
      aAab_Darwin7_9_Long_Double_FuncsTests,   apzAab_Darwin7_9_Long_Double_FuncsPatch, 0 },
 
-  {  zAab_Darwin7_9_Long_Double_Funcs_2Name,    zAab_Darwin7_9_Long_Double_Funcs_2List,
-     apzAab_Darwin7_9_Long_Double_Funcs_2Machs,
-     AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAab_Darwin7_9_Long_Double_Funcs_2Tests,   apzAab_Darwin7_9_Long_Double_Funcs_2Patch, 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,
@@ -8813,11 +10480,86 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
      aAab_Sun_MemcpyTests,   apzAab_Sun_MemcpyPatch, 0 },
 
+  {  zAab_Vxworks_AssertName,    zAab_Vxworks_AssertList,
+     apzAab_Vxworks_AssertMachs,
+     AAB_VXWORKS_ASSERT_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+     aAab_Vxworks_AssertTests,   apzAab_Vxworks_AssertPatch, 0 },
+
+  {  zAab_Vxworks_Regs_VxtypesName,    zAab_Vxworks_Regs_VxtypesList,
+     apzAab_Vxworks_Regs_VxtypesMachs,
+     AAB_VXWORKS_REGS_VXTYPES_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+     aAab_Vxworks_Regs_VxtypesTests,   apzAab_Vxworks_Regs_VxtypesPatch, 0 },
+
+  {  zAab_Vxworks_UnistdName,    zAab_Vxworks_UnistdList,
+     apzAab_Vxworks_UnistdMachs,
+     AAB_VXWORKS_UNISTD_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+     aAab_Vxworks_UnistdTests,   apzAab_Vxworks_UnistdPatch, 0 },
+
+  {  zAix_AssertName,    zAix_AssertList,
+     apzAix_AssertMachs,
+     AIX_ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_AssertTests,   apzAix_AssertPatch, 0 },
+
   {  zAix_ComplexName,    zAix_ComplexList,
      apzAix_ComplexMachs,
      AIX_COMPLEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAix_ComplexTests,   apzAix_ComplexPatch, 0 },
 
+  {  zAix_ExterncName,    zAix_ExterncList,
+     apzAix_ExterncMachs,
+     AIX_EXTERNC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_ExterncTests,   apzAix_ExterncPatch, 0 },
+
+  {  zAix_Externcpp1Name,    zAix_Externcpp1List,
+     apzAix_Externcpp1Machs,
+     AIX_EXTERNCPP1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Externcpp1Tests,   apzAix_Externcpp1Patch, 0 },
+
+  {  zAix_Externcpp2Name,    zAix_Externcpp2List,
+     apzAix_Externcpp2Machs,
+     AIX_EXTERNCPP2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Externcpp2Tests,   apzAix_Externcpp2Patch, 0 },
+
+  {  zAix_MallocName,    zAix_MallocList,
+     apzAix_MallocMachs,
+     AIX_MALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_MallocTests,   apzAix_MallocPatch, 0 },
+
+  {  zAix_Net_If_ArpName,    zAix_Net_If_ArpList,
+     apzAix_Net_If_ArpMachs,
+     AIX_NET_IF_ARP_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Net_If_ArpTests,   apzAix_Net_If_ArpPatch, 0 },
+
+  {  zAix_NullName,    zAix_NullList,
+     apzAix_NullMachs,
+     AIX_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_NullTests,   apzAix_NullPatch, 0 },
+
+  {  zAix_Once_Init_1Name,    zAix_Once_Init_1List,
+     apzAix_Once_Init_1Machs,
+     AIX_ONCE_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Once_Init_1Tests,   apzAix_Once_Init_1Patch, 0 },
+
+  {  zAix_Once_Init_2Name,    zAix_Once_Init_2List,
+     apzAix_Once_Init_2Machs,
+     AIX_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Once_Init_2Tests,   apzAix_Once_Init_2Patch, 0 },
+
+  {  zAix_Mutex_Initializer_1Name,    zAix_Mutex_Initializer_1List,
+     apzAix_Mutex_Initializer_1Machs,
+     AIX_MUTEX_INITIALIZER_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Mutex_Initializer_1Tests,   apzAix_Mutex_Initializer_1Patch, 0 },
+
+  {  zAix_Cond_Initializer_1Name,    zAix_Cond_Initializer_1List,
+     apzAix_Cond_Initializer_1Machs,
+     AIX_COND_INITIALIZER_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Cond_Initializer_1Tests,   apzAix_Cond_Initializer_1Patch, 0 },
+
+  {  zAix_Rwlock_Initializer_1Name,    zAix_Rwlock_Initializer_1List,
+     apzAix_Rwlock_Initializer_1Machs,
+     AIX_RWLOCK_INITIALIZER_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Rwlock_Initializer_1Tests,   apzAix_Rwlock_Initializer_1Patch, 0 },
+
   {  zAix_PthreadName,    zAix_PthreadList,
      apzAix_PthreadMachs,
      AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -8848,6 +10590,46 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AIX_STDINT_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAix_Stdint_5Tests,   apzAix_Stdint_5Patch, 0 },
 
+  {  zAix_Stdio_InlineName,    zAix_Stdio_InlineList,
+     apzAix_Stdio_InlineMachs,
+     AIX_STDIO_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdio_InlineTests,   apzAix_Stdio_InlinePatch, 0 },
+
+  {  zAix_Stdlib_MallocName,    zAix_Stdlib_MallocList,
+     apzAix_Stdlib_MallocMachs,
+     AIX_STDLIB_MALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdlib_MallocTests,   apzAix_Stdlib_MallocPatch, 0 },
+
+  {  zAix_Stdlib_ReallocName,    zAix_Stdlib_ReallocList,
+     apzAix_Stdlib_ReallocMachs,
+     AIX_STDLIB_REALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdlib_ReallocTests,   apzAix_Stdlib_ReallocPatch, 0 },
+
+  {  zAix_Stdlib_CallocName,    zAix_Stdlib_CallocList,
+     apzAix_Stdlib_CallocMachs,
+     AIX_STDLIB_CALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdlib_CallocTests,   apzAix_Stdlib_CallocPatch, 0 },
+
+  {  zAix_Stdlib_VallocName,    zAix_Stdlib_VallocList,
+     apzAix_Stdlib_VallocMachs,
+     AIX_STDLIB_VALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdlib_VallocTests,   apzAix_Stdlib_VallocPatch, 0 },
+
+  {  zAix_Stdlib_Vec_MallocName,    zAix_Stdlib_Vec_MallocList,
+     apzAix_Stdlib_Vec_MallocMachs,
+     AIX_STDLIB_VEC_MALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdlib_Vec_MallocTests,   apzAix_Stdlib_Vec_MallocPatch, 0 },
+
+  {  zAix_Stdlib_Vec_CallocName,    zAix_Stdlib_Vec_CallocList,
+     apzAix_Stdlib_Vec_CallocMachs,
+     AIX_STDLIB_VEC_CALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdlib_Vec_CallocTests,   apzAix_Stdlib_Vec_CallocPatch, 0 },
+
+  {  zAix_Strtof_ConstName,    zAix_Strtof_ConstList,
+     apzAix_Strtof_ConstMachs,
+     AIX_STRTOF_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Strtof_ConstTests,   apzAix_Strtof_ConstPatch, 0 },
+
   {  zAix_SysmachineName,    zAix_SysmachineList,
      apzAix_SysmachineMachs,
      AIX_SYSMACHINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -8863,36 +10645,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AIX_VOLATILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAix_VolatileTests,   apzAix_VolatilePatch, 0 },
 
+  {  zAix_UnistdName,    zAix_UnistdList,
+     apzAix_UnistdMachs,
+     AIX_UNISTD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_UnistdTests,   apzAix_UnistdPatch, 0 },
+
   {  zAlpha___AssertName,    zAlpha___AssertList,
      apzAlpha___AssertMachs,
      ALPHA___ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAlpha___AssertTests,   apzAlpha___AssertPatch, 0 },
 
-  {  zAlpha___Extern_PrefixName,    zAlpha___Extern_PrefixList,
-     apzAlpha___Extern_PrefixMachs,
-     ALPHA___EXTERN_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAlpha___Extern_PrefixTests,   apzAlpha___Extern_PrefixPatch, 0 },
-
-  {  zAlpha___Extern_Prefix_StandardsName,    zAlpha___Extern_Prefix_StandardsList,
-     apzAlpha___Extern_Prefix_StandardsMachs,
-     ALPHA___EXTERN_PREFIX_STANDARDS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAlpha___Extern_Prefix_StandardsTests,   apzAlpha___Extern_Prefix_StandardsPatch, 0 },
-
-  {  zAlpha___Extern_Prefix_Sys_StatName,    zAlpha___Extern_Prefix_Sys_StatList,
-     apzAlpha___Extern_Prefix_Sys_StatMachs,
-     ALPHA___EXTERN_PREFIX_SYS_STAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAlpha___Extern_Prefix_Sys_StatTests,   apzAlpha___Extern_Prefix_Sys_StatPatch, 0 },
-
   {  zAlpha_AssertName,    zAlpha_AssertList,
      apzAlpha_AssertMachs,
      ALPHA_ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAlpha_AssertTests,   apzAlpha_AssertPatch, 0 },
 
-  {  zAlpha_Bad_LvalName,    zAlpha_Bad_LvalList,
-     apzAlpha_Bad_LvalMachs,
-     ALPHA_BAD_LVAL_TEST_CT, FD_MACH_ONLY,
-     aAlpha_Bad_LvalTests,   apzAlpha_Bad_LvalPatch, 0 },
-
   {  zAlpha_GetoptName,    zAlpha_GetoptList,
      apzAlpha_GetoptMachs,
      ALPHA_GETOPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -8908,21 +10675,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ALPHA_PARENS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAlpha_ParensTests,   apzAlpha_ParensPatch, 0 },
 
-  {  zAlpha_PthreadName,    zAlpha_PthreadList,
-     apzAlpha_PthreadMachs,
-     ALPHA_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAlpha_PthreadTests,   apzAlpha_PthreadPatch, 0 },
-
-  {  zAlpha_Pthread_GccName,    zAlpha_Pthread_GccList,
-     apzAlpha_Pthread_GccMachs,
-     ALPHA_PTHREAD_GCC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAlpha_Pthread_GccTests,   apzAlpha_Pthread_GccPatch, 0 },
-
-  {  zAlpha_Pthread_InitName,    zAlpha_Pthread_InitList,
-     apzAlpha_Pthread_InitMachs,
-     ALPHA_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY,
-     aAlpha_Pthread_InitTests,   apzAlpha_Pthread_InitPatch, 0 },
-
   {  zAlpha_SbrkName,    zAlpha_SbrkList,
      apzAlpha_SbrkMachs,
      ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -8993,6 +10745,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aCxx_UnreadyTests,   apzCxx_UnreadyPatch, 0 },
 
+  {  zDarwin_AvailabilityinternalName,    zDarwin_AvailabilityinternalList,
+     apzDarwin_AvailabilityinternalMachs,
+     DARWIN_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_AvailabilityinternalTests,   apzDarwin_AvailabilityinternalPatch, 0 },
+
+  {  zDarwin_9_Long_Double_Funcs_2Name,    zDarwin_9_Long_Double_Funcs_2List,
+     apzDarwin_9_Long_Double_Funcs_2Machs,
+     DARWIN_9_LONG_DOUBLE_FUNCS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_9_Long_Double_Funcs_2Tests,   apzDarwin_9_Long_Double_Funcs_2Patch, 0 },
+
   {  zDarwin_ExterncName,    zDarwin_ExterncList,
      apzDarwin_ExterncMachs,
      DARWIN_EXTERNC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9003,6 +10765,26 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      DARWIN_GCC4_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aDarwin_Gcc4_BreakageTests,   apzDarwin_Gcc4_BreakagePatch, 0 },
 
+  {  zDarwin_Longjmp_NoreturnName,    zDarwin_Longjmp_NoreturnList,
+     apzDarwin_Longjmp_NoreturnMachs,
+     DARWIN_LONGJMP_NORETURN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Longjmp_NoreturnTests,   apzDarwin_Longjmp_NoreturnPatch, 0 },
+
+  {  zDarwin_Os_Trace_1Name,    zDarwin_Os_Trace_1List,
+     apzDarwin_Os_Trace_1Machs,
+     DARWIN_OS_TRACE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Os_Trace_1Tests,   apzDarwin_Os_Trace_1Patch, 0 },
+
+  {  zDarwin_Os_Trace_2Name,    zDarwin_Os_Trace_2List,
+     apzDarwin_Os_Trace_2Machs,
+     DARWIN_OS_TRACE_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Os_Trace_2Tests,   apzDarwin_Os_Trace_2Patch, 0 },
+
+  {  zDarwin_Os_Trace_3Name,    zDarwin_Os_Trace_3List,
+     apzDarwin_Os_Trace_3Machs,
+     DARWIN_OS_TRACE_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Os_Trace_3Tests,   apzDarwin_Os_Trace_3Patch, 0 },
+
   {  zDarwin_Private_ExternName,    zDarwin_Private_ExternList,
      apzDarwin_Private_ExternMachs,
      DARWIN_PRIVATE_EXTERN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9058,6 +10840,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ECD_CURSOR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aEcd_CursorTests,   apzEcd_CursorPatch, 0 },
 
+  {  zFeraiseexcept_Nosse_DivbyzeroName,    zFeraiseexcept_Nosse_DivbyzeroList,
+     apzFeraiseexcept_Nosse_DivbyzeroMachs,
+     FERAISEEXCEPT_NOSSE_DIVBYZERO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aFeraiseexcept_Nosse_DivbyzeroTests,   apzFeraiseexcept_Nosse_DivbyzeroPatch, 0 },
+
+  {  zFeraiseexcept_Nosse_InvalidName,    zFeraiseexcept_Nosse_InvalidList,
+     apzFeraiseexcept_Nosse_InvalidMachs,
+     FERAISEEXCEPT_NOSSE_INVALID_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aFeraiseexcept_Nosse_InvalidTests,   apzFeraiseexcept_Nosse_InvalidPatch, 0 },
+
   {  zFreebsd_Gcc3_BreakageName,    zFreebsd_Gcc3_BreakageList,
      apzFreebsd_Gcc3_BreakageMachs,
      FREEBSD_GCC3_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9158,16 +10950,41 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX10_STDIO_DECLARATIONS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux10_Stdio_DeclarationsTests,   apzHpux10_Stdio_DeclarationsPatch, 0 },
 
+  {  zHppa_Hpux11_AllocaName,    zHppa_Hpux11_AllocaList,
+     apzHppa_Hpux11_AllocaMachs,
+     HPPA_HPUX11_ALLOCA_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHppa_Hpux11_AllocaTests,   apzHppa_Hpux11_AllocaPatch, 0 },
+
   {  zHpux11_AbsName,    zHpux11_AbsList,
      apzHpux11_AbsMachs,
      HPUX11_ABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_AbsTests,   apzHpux11_AbsPatch, 0 },
 
+  {  zHpux11_Lwp_Rwlock_ValidName,    zHpux11_Lwp_Rwlock_ValidList,
+     apzHpux11_Lwp_Rwlock_ValidMachs,
+     HPUX11_LWP_RWLOCK_VALID_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_Lwp_Rwlock_ValidTests,   apzHpux11_Lwp_Rwlock_ValidPatch, 0 },
+
+  {  zHpux11_Extern_SendfileName,    zHpux11_Extern_SendfileList,
+     apzHpux11_Extern_SendfileMachs,
+     HPUX11_EXTERN_SENDFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_Extern_SendfileTests,   apzHpux11_Extern_SendfilePatch, 0 },
+
+  {  zHpux11_Extern_SendpathName,    zHpux11_Extern_SendpathList,
+     apzHpux11_Extern_SendpathMachs,
+     HPUX11_EXTERN_SENDPATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_Extern_SendpathTests,   apzHpux11_Extern_SendpathPatch, 0 },
+
   {  zHpux11_FabsfName,    zHpux11_FabsfList,
      apzHpux11_FabsfMachs,
      HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_FabsfTests,   apzHpux11_FabsfPatch, 0 },
 
+  {  zHpux11_Pthread_PointerName,    zHpux11_Pthread_PointerList,
+     apzHpux11_Pthread_PointerMachs,
+     HPUX11_PTHREAD_POINTER_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_Pthread_PointerTests,   apzHpux11_Pthread_PointerPatch, 0 },
+
   {  zHpux11_Pthread_ConstName,    zHpux11_Pthread_ConstList,
      apzHpux11_Pthread_ConstMachs,
      HPUX11_PTHREAD_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9188,21 +11005,56 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX11_VSNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_VsnprintfTests,   apzHpux11_VsnprintfPatch, 0 },
 
+  {  zHpux_VsscanfName,    zHpux_VsscanfList,
+     apzHpux_VsscanfMachs,
+     HPUX_VSSCANF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_VsscanfTests,   apzHpux_VsscanfPatch, 0 },
+
   {  zHpux8_Bogus_InlinesName,    zHpux8_Bogus_InlinesList,
      apzHpux8_Bogus_InlinesMachs,
      HPUX8_BOGUS_INLINES_TEST_CT, FD_MACH_ONLY,
      aHpux8_Bogus_InlinesTests,   apzHpux8_Bogus_InlinesPatch, 0 },
 
+  {  zHpux_C99_IntptrName,    zHpux_C99_IntptrList,
+     apzHpux_C99_IntptrMachs,
+     HPUX_C99_INTPTR_TEST_CT, FD_MACH_ONLY,
+     aHpux_C99_IntptrTests,   apzHpux_C99_IntptrPatch, 0 },
+
+  {  zHpux_C99_InttypesName,    zHpux_C99_InttypesList,
+     apzHpux_C99_InttypesMachs,
+     HPUX_C99_INTTYPES_TEST_CT, FD_MACH_ONLY,
+     aHpux_C99_InttypesTests,   apzHpux_C99_InttypesPatch, 0 },
+
+  {  zHpux_C99_Inttypes2Name,    zHpux_C99_Inttypes2List,
+     apzHpux_C99_Inttypes2Machs,
+     HPUX_C99_INTTYPES2_TEST_CT, FD_MACH_ONLY,
+     aHpux_C99_Inttypes2Tests,   apzHpux_C99_Inttypes2Patch, 0 },
+
   {  zHpux_Ctype_MacrosName,    zHpux_Ctype_MacrosList,
      apzHpux_Ctype_MacrosMachs,
      HPUX_CTYPE_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux_Ctype_MacrosTests,   apzHpux_Ctype_MacrosPatch, 0 },
 
+  {  zHpux_Extern_ErrnoName,    zHpux_Extern_ErrnoList,
+     apzHpux_Extern_ErrnoMachs,
+     HPUX_EXTERN_ERRNO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Extern_ErrnoTests,   apzHpux_Extern_ErrnoPatch, 0 },
+
   {  zHpux_HtonlName,    zHpux_HtonlList,
      apzHpux_HtonlMachs,
      HPUX_HTONL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux_HtonlTests,   apzHpux_HtonlPatch, 0 },
 
+  {  zHpux_Imaginary_IName,    zHpux_Imaginary_IList,
+     apzHpux_Imaginary_IMachs,
+     HPUX_IMAGINARY_I_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Imaginary_ITests,   apzHpux_Imaginary_IPatch, 0 },
+
+  {  zHpux_Inttype_Int8_TName,    zHpux_Inttype_Int8_TList,
+     apzHpux_Inttype_Int8_TMachs,
+     HPUX_INTTYPE_INT8_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Inttype_Int8_TTests,   apzHpux_Inttype_Int8_TPatch, 0 },
+
   {  zHpux_Long_DoubleName,    zHpux_Long_DoubleList,
      apzHpux_Long_DoubleMachs,
      HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY,
@@ -9213,65 +11065,30 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX_LONG_DOUBLE_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux_Long_Double_2Tests,   apzHpux_Long_Double_2Patch, 0 },
 
-  {  zHpux_SystimeName,    zHpux_SystimeList,
-     apzHpux_SystimeMachs,
-     HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_SystimeTests,   apzHpux_SystimePatch, 0 },
-
-  {  zHpux_Spu_InfoName,    zHpux_Spu_InfoList,
-     apzHpux_Spu_InfoMachs,
-     HPUX_SPU_INFO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_Spu_InfoTests,   apzHpux_Spu_InfoPatch, 0 },
-
-  {  zHpux11_Extern_SendfileName,    zHpux11_Extern_SendfileList,
-     apzHpux11_Extern_SendfileMachs,
-     HPUX11_EXTERN_SENDFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_Extern_SendfileTests,   apzHpux11_Extern_SendfilePatch, 0 },
-
-  {  zHpux11_Extern_SendpathName,    zHpux11_Extern_SendpathList,
-     apzHpux11_Extern_SendpathMachs,
-     HPUX11_EXTERN_SENDPATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_Extern_SendpathTests,   apzHpux11_Extern_SendpathPatch, 0 },
-
-  {  zHpux_Extern_ErrnoName,    zHpux_Extern_ErrnoList,
-     apzHpux_Extern_ErrnoMachs,
-     HPUX_EXTERN_ERRNO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_Extern_ErrnoTests,   apzHpux_Extern_ErrnoPatch, 0 },
-
   {  zHpux_Pthread_InitializersName,    zHpux_Pthread_InitializersList,
      apzHpux_Pthread_InitializersMachs,
      HPUX_PTHREAD_INITIALIZERS_TEST_CT, FD_MACH_ONLY,
      aHpux_Pthread_InitializersTests,   apzHpux_Pthread_InitializersPatch, 0 },
 
-  {  zHpux_C99_IntptrName,    zHpux_C99_IntptrList,
-     apzHpux_C99_IntptrMachs,
-     HPUX_C99_INTPTR_TEST_CT, FD_MACH_ONLY,
-     aHpux_C99_IntptrTests,   apzHpux_C99_IntptrPatch, 0 },
-
-  {  zHpux_C99_InttypesName,    zHpux_C99_InttypesList,
-     apzHpux_C99_InttypesMachs,
-     HPUX_C99_INTTYPES_TEST_CT, FD_MACH_ONLY,
-     aHpux_C99_InttypesTests,   apzHpux_C99_InttypesPatch, 0 },
-
-  {  zHpux_C99_Inttypes2Name,    zHpux_C99_Inttypes2List,
-     apzHpux_C99_Inttypes2Machs,
-     HPUX_C99_INTTYPES2_TEST_CT, FD_MACH_ONLY,
-     aHpux_C99_Inttypes2Tests,   apzHpux_C99_Inttypes2Patch, 0 },
+  {  zHpux_Spu_InfoName,    zHpux_Spu_InfoList,
+     apzHpux_Spu_InfoMachs,
+     HPUX_SPU_INFO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Spu_InfoTests,   apzHpux_Spu_InfoPatch, 0 },
 
   {  zHpux_Stdint_Least_FastName,    zHpux_Stdint_Least_FastList,
      apzHpux_Stdint_Least_FastMachs,
      HPUX_STDINT_LEAST_FAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux_Stdint_Least_FastTests,   apzHpux_Stdint_Least_FastPatch, 0 },
 
-  {  zHpux_Inttype_Int8_TName,    zHpux_Inttype_Int8_TList,
-     apzHpux_Inttype_Int8_TMachs,
-     HPUX_INTTYPE_INT8_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_Inttype_Int8_TTests,   apzHpux_Inttype_Int8_TPatch, 0 },
+  {  zHpux_LongjmpName,    zHpux_LongjmpList,
+     apzHpux_LongjmpMachs,
+     HPUX_LONGJMP_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_LongjmpTests,   apzHpux_LongjmpPatch, 0 },
 
-  {  zHpux_Imaginary_IName,    zHpux_Imaginary_IList,
-     apzHpux_Imaginary_IMachs,
-     HPUX_IMAGINARY_I_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_Imaginary_ITests,   apzHpux_Imaginary_IPatch, 0 },
+  {  zHpux_SystimeName,    zHpux_SystimeList,
+     apzHpux_SystimeMachs,
+     HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_SystimeTests,   apzHpux_SystimePatch, 0 },
 
   {  zHuge_Val_HexName,    zHuge_Val_HexList,
      apzHuge_Val_HexMachs,
@@ -9308,71 +11125,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      IP_MISSING_SEMI_TEST_CT, FD_MACH_ONLY,
      aIp_Missing_SemiTests,   apzIp_Missing_SemiPatch, 0 },
 
-  {  zIrix___RestrictName,    zIrix___RestrictList,
-     apzIrix___RestrictMachs,
-     IRIX___RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix___RestrictTests,   apzIrix___RestrictPatch, 0 },
-
-  {  zIrix___Generic1Name,    zIrix___Generic1List,
-     apzIrix___Generic1Machs,
-     IRIX___GENERIC1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix___Generic1Tests,   apzIrix___Generic1Patch, 0 },
-
-  {  zIrix___Generic2Name,    zIrix___Generic2List,
-     apzIrix___Generic2Machs,
-     IRIX___GENERIC2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix___Generic2Tests,   apzIrix___Generic2Patch, 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, 0 },
-
-  {  zIrix_ComplexName,    zIrix_ComplexList,
-     apzIrix_ComplexMachs,
-     IRIX_COMPLEX_TEST_CT, FD_MACH_ONLY,
-     aIrix_ComplexTests,   apzIrix_ComplexPatch, 0 },
-
   {  zIrix_Limits_ConstName,    zIrix_Limits_ConstList,
      apzIrix_Limits_ConstMachs,
      IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIrix_Limits_ConstTests,   apzIrix_Limits_ConstPatch, 0 },
 
-  {  zIrix_Pthread_InitName,    zIrix_Pthread_InitList,
-     apzIrix_Pthread_InitMachs,
-     IRIX_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix_Pthread_InitTests,   apzIrix_Pthread_InitPatch, 0 },
-
-  {  zIrix_Socklen_TName,    zIrix_Socklen_TList,
-     apzIrix_Socklen_TMachs,
-     IRIX_SOCKLEN_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix_Socklen_TTests,   apzIrix_Socklen_TPatch, 0 },
-
-  {  zIrix_Stdint_C99_ModeName,    zIrix_Stdint_C99_ModeList,
-     apzIrix_Stdint_C99_ModeMachs,
-     IRIX_STDINT_C99_MODE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix_Stdint_C99_ModeTests,   apzIrix_Stdint_C99_ModePatch, 0 },
-
-  {  zIrix_Stdint_C99_TypesName,    zIrix_Stdint_C99_TypesList,
-     apzIrix_Stdint_C99_TypesMachs,
-     IRIX_STDINT_C99_TYPES_TEST_CT, FD_MACH_ONLY,
-     aIrix_Stdint_C99_TypesTests,   apzIrix_Stdint_C99_TypesPatch, 0 },
-
-  {  zIrix_Stdint_C99_MacrosName,    zIrix_Stdint_C99_MacrosList,
-     apzIrix_Stdint_C99_MacrosMachs,
-     IRIX_STDINT_C99_MACROS_TEST_CT, FD_MACH_ONLY,
-     aIrix_Stdint_C99_MacrosTests,   apzIrix_Stdint_C99_MacrosPatch, 0 },
-
   {  zIrix_Stdio_Va_ListName,    zIrix_Stdio_Va_ListList,
      apzIrix_Stdio_Va_ListMachs,
      IRIX_STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIrix_Stdio_Va_ListTests,   apzIrix_Stdio_Va_ListPatch, 0 },
 
-  {  zIrix_WcsftimeName,    zIrix_WcsftimeList,
-     apzIrix_WcsftimeMachs,
-     IRIX_WCSFTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix_WcsftimeTests,   apzIrix_WcsftimePatch, 0 },
-
   {  zKandr_ConcatName,    zKandr_ConcatList,
      apzKandr_ConcatMachs,
      KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9405,7 +11167,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
 
   {  zMath_ExceptionName,    zMath_ExceptionList,
      apzMath_ExceptionMachs,
-     MATH_EXCEPTION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     MATH_EXCEPTION_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE,
      aMath_ExceptionTests,   apzMath_ExceptionPatch, 0 },
 
   {  zMath_Huge_Val_From_Dbl_MaxName,    zMath_Huge_Val_From_Dbl_MaxList,
@@ -9543,16 +11305,56 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SOLARIS_COMPLEX_CXX_TEST_CT, FD_MACH_ONLY,
      aSolaris_Complex_CxxTests,   apzSolaris_Complex_CxxPatch, 0 },
 
-  {  zSolaris_Cond_InitName,    zSolaris_Cond_InitList,
-     apzSolaris_Cond_InitMachs,
-     SOLARIS_COND_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Cond_InitTests,   apzSolaris_Cond_InitPatch, 0 },
+  {  zSolaris_Cxx_LinkageName,    zSolaris_Cxx_LinkageList,
+     apzSolaris_Cxx_LinkageMachs,
+     SOLARIS_CXX_LINKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Cxx_LinkageTests,   apzSolaris_Cxx_LinkagePatch, 0 },
+
+  {  zSolaris_Getc_Strict_StdcName,    zSolaris_Getc_Strict_StdcList,
+     apzSolaris_Getc_Strict_StdcMachs,
+     SOLARIS_GETC_STRICT_STDC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Getc_Strict_StdcTests,   apzSolaris_Getc_Strict_StdcPatch, 0 },
+
+  {  zSolaris_Gets_C11Name,    zSolaris_Gets_C11List,
+     apzSolaris_Gets_C11Machs,
+     SOLARIS_GETS_C11_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Gets_C11Tests,   apzSolaris_Gets_C11Patch, 0 },
+
+  {  zSolaris_Gets_Cxx14Name,    zSolaris_Gets_Cxx14List,
+     apzSolaris_Gets_Cxx14Machs,
+     SOLARIS_GETS_CXX14_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Gets_Cxx14Tests,   apzSolaris_Gets_Cxx14Patch, 0 },
+
+  {  zSolaris_Int_ConstName,    zSolaris_Int_ConstList,
+     apzSolaris_Int_ConstMachs,
+     SOLARIS_INT_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Int_ConstTests,   apzSolaris_Int_ConstPatch, 0 },
+
+  {  zSolaris_Int_Limits_1Name,    zSolaris_Int_Limits_1List,
+     apzSolaris_Int_Limits_1Machs,
+     SOLARIS_INT_LIMITS_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Int_Limits_1Tests,   apzSolaris_Int_Limits_1Patch, 0 },
+
+  {  zSolaris_Int_Limits_2Name,    zSolaris_Int_Limits_2List,
+     apzSolaris_Int_Limits_2Machs,
+     SOLARIS_INT_LIMITS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Int_Limits_2Tests,   apzSolaris_Int_Limits_2Patch, 0 },
+
+  {  zSolaris_Int_Limits_3Name,    zSolaris_Int_Limits_3List,
+     apzSolaris_Int_Limits_3Machs,
+     SOLARIS_INT_LIMITS_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Int_Limits_3Tests,   apzSolaris_Int_Limits_3Patch, 0 },
 
   {  zSolaris_Math_1Name,    zSolaris_Math_1List,
      apzSolaris_Math_1Machs,
      SOLARIS_MATH_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSolaris_Math_1Tests,   apzSolaris_Math_1Patch, 0 },
 
+  {  zSolaris_Math_10Name,    zSolaris_Math_10List,
+     apzSolaris_Math_10Machs,
+     SOLARIS_MATH_10_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Math_10Tests,   apzSolaris_Math_10Patch, 0 },
+
   {  zSolaris_Math_2Name,    zSolaris_Math_2List,
      apzSolaris_Math_2Machs,
      SOLARIS_MATH_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9578,65 +11380,55 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SOLARIS_MATH_9_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSolaris_Math_9Tests,   apzSolaris_Math_9Patch, 0 },
 
-  {  zSolaris_Math_10Name,    zSolaris_Math_10List,
-     apzSolaris_Math_10Machs,
-     SOLARIS_MATH_10_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Math_10Tests,   apzSolaris_Math_10Patch, 0 },
-
-  {  zSolaris_Mutex_Init_2Name,    zSolaris_Mutex_Init_2List,
-     apzSolaris_Mutex_Init_2Machs,
-     SOLARIS_MUTEX_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Mutex_Init_2Tests,   apzSolaris_Mutex_Init_2Patch, 0 },
+  {  zSolaris_Math_11Name,    zSolaris_Math_11List,
+     apzSolaris_Math_11Machs,
+     SOLARIS_MATH_11_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Math_11Tests,   apzSolaris_Math_11Patch, 0 },
 
-  {  zSolaris_Rwlock_Init_1Name,    zSolaris_Rwlock_Init_1List,
-     apzSolaris_Rwlock_Init_1Machs,
-     SOLARIS_RWLOCK_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Rwlock_Init_1Tests,   apzSolaris_Rwlock_Init_1Patch, 0 },
+  {  zSolaris_Math_12Name,    zSolaris_Math_12List,
+     apzSolaris_Math_12Machs,
+     SOLARIS_MATH_12_TEST_CT, FD_MACH_ONLY,
+     aSolaris_Math_12Tests,   apzSolaris_Math_12Patch, 0 },
 
   {  zSolaris_Once_Init_1Name,    zSolaris_Once_Init_1List,
      apzSolaris_Once_Init_1Machs,
      SOLARIS_ONCE_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSolaris_Once_Init_1Tests,   apzSolaris_Once_Init_1Patch, 0 },
 
-  {  zSolaris_Once_Init_2Name,    zSolaris_Once_Init_2List,
-     apzSolaris_Once_Init_2Machs,
-     SOLARIS_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Once_Init_2Tests,   apzSolaris_Once_Init_2Patch, 0 },
-
-  {  zSolaris_Int_ConstName,    zSolaris_Int_ConstList,
-     apzSolaris_Int_ConstMachs,
-     SOLARIS_INT_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Int_ConstTests,   apzSolaris_Int_ConstPatch, 0 },
+  {  zSolaris_Posix_Spawn_RestrictName,    zSolaris_Posix_Spawn_RestrictList,
+     apzSolaris_Posix_Spawn_RestrictMachs,
+     SOLARIS_POSIX_SPAWN_RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Posix_Spawn_RestrictTests,   apzSolaris_Posix_Spawn_RestrictPatch, 0 },
 
-  {  zSolaris_Int_Limits_1Name,    zSolaris_Int_Limits_1List,
-     apzSolaris_Int_Limits_1Machs,
-     SOLARIS_INT_LIMITS_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Int_Limits_1Tests,   apzSolaris_Int_Limits_1Patch, 0 },
+  {  zSolaris_Pow_Int_OverloadName,    zSolaris_Pow_Int_OverloadList,
+     apzSolaris_Pow_Int_OverloadMachs,
+     SOLARIS_POW_INT_OVERLOAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Pow_Int_OverloadTests,   apzSolaris_Pow_Int_OverloadPatch, 0 },
 
-  {  zSolaris_Int_Limits_2Name,    zSolaris_Int_Limits_2List,
-     apzSolaris_Int_Limits_2Machs,
-     SOLARIS_INT_LIMITS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Int_Limits_2Tests,   apzSolaris_Int_Limits_2Patch, 0 },
+  {  zSolaris_Rwlock_Init_1Name,    zSolaris_Rwlock_Init_1List,
+     apzSolaris_Rwlock_Init_1Machs,
+     SOLARIS_RWLOCK_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Rwlock_Init_1Tests,   apzSolaris_Rwlock_Init_1Patch, 0 },
 
-  {  zSolaris_Int_Limits_3Name,    zSolaris_Int_Limits_3List,
-     apzSolaris_Int_Limits_3Machs,
-     SOLARIS_INT_LIMITS_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Int_Limits_3Tests,   apzSolaris_Int_Limits_3Patch, 0 },
+  {  zSolaris_Std___FilbufName,    zSolaris_Std___FilbufList,
+     apzSolaris_Std___FilbufMachs,
+     SOLARIS_STD___FILBUF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Std___FilbufTests,   apzSolaris_Std___FilbufPatch, 0 },
 
-  {  zSolaris_Int_TypesName,    zSolaris_Int_TypesList,
-     apzSolaris_Int_TypesMachs,
-     SOLARIS_INT_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Int_TypesTests,   apzSolaris_Int_TypesPatch, 0 },
+  {  zSolaris_Std_Gets_Cxx14Name,    zSolaris_Std_Gets_Cxx14List,
+     apzSolaris_Std_Gets_Cxx14Machs,
+     SOLARIS_STD_GETS_CXX14_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Std_Gets_Cxx14Tests,   apzSolaris_Std_Gets_Cxx14Patch, 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_Sys_Va_ListName,    zSolaris_Sys_Va_ListList,
-     apzSolaris_Sys_Va_ListMachs,
-     SOLARIS_SYS_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_Sys_Va_ListTests,   apzSolaris_Sys_Va_ListPatch, 0 },
+  {  zSolaris_Stdlib_NoreturnName,    zSolaris_Stdlib_NoreturnList,
+     apzSolaris_Stdlib_NoreturnMachs,
+     SOLARIS_STDLIB_NORETURN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Stdlib_NoreturnTests,   apzSolaris_Stdlib_NoreturnPatch, 0 },
 
   {  zStatsswtchName,    zStatsswtchList,
      apzStatsswtchMachs,
@@ -9718,6 +11510,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SUNOS_STRLEN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSunos_StrlenTests,   apzSunos_StrlenPatch, 0 },
 
+  {  zSuse_Linux_Vt_CxxName,    zSuse_Linux_Vt_CxxList,
+     apzSuse_Linux_Vt_CxxMachs,
+     SUSE_LINUX_VT_CXX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSuse_Linux_Vt_CxxTests,   apzSuse_Linux_Vt_CxxPatch, 0 },
+
   {  zSvr4_Disable_OptName,    zSvr4_Disable_OptList,
      apzSvr4_Disable_OptMachs,
      SVR4_DISABLE_OPT_TEST_CT, FD_MACH_ONLY,
@@ -9778,6 +11575,56 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      VA_I960_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aVa_I960_MacroTests,   apzVa_I960_MacroPatch, 0 },
 
+  {  zVms_Add_Missing_BracesName,    zVms_Add_Missing_BracesList,
+     apzVms_Add_Missing_BracesMachs,
+     VMS_ADD_MISSING_BRACES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_Add_Missing_BracesTests,   apzVms_Add_Missing_BracesPatch, 0 },
+
+  {  zVms_Decc_BuiltinName,    zVms_Decc_BuiltinList,
+     apzVms_Decc_BuiltinMachs,
+     VMS_DECC_BUILTIN_TEST_CT, FD_MACH_ONLY,
+     aVms_Decc_BuiltinTests,   apzVms_Decc_BuiltinPatch, 0 },
+
+  {  zVms_Define_Can_Use_Extern_PrefixName,    zVms_Define_Can_Use_Extern_PrefixList,
+     apzVms_Define_Can_Use_Extern_PrefixMachs,
+     VMS_DEFINE_CAN_USE_EXTERN_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_Define_Can_Use_Extern_PrefixTests,   apzVms_Define_Can_Use_Extern_PrefixPatch, 0 },
+
+  {  zVms_Disable_Decc_String_BuiltinsName,    zVms_Disable_Decc_String_BuiltinsList,
+     apzVms_Disable_Decc_String_BuiltinsMachs,
+     VMS_DISABLE_DECC_STRING_BUILTINS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_Disable_Decc_String_BuiltinsTests,   apzVms_Disable_Decc_String_BuiltinsPatch, 0 },
+
+  {  zVms_Do_Not_Redeclare_HostaliasName,    zVms_Do_Not_Redeclare_HostaliasList,
+     apzVms_Do_Not_Redeclare_HostaliasMachs,
+     VMS_DO_NOT_REDECLARE_HOSTALIAS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_Do_Not_Redeclare_HostaliasTests,   apzVms_Do_Not_Redeclare_HostaliasPatch, 0 },
+
+  {  zVms_Forward_Declare_StructName,    zVms_Forward_Declare_StructList,
+     apzVms_Forward_Declare_StructMachs,
+     VMS_FORWARD_DECLARE_STRUCT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_Forward_Declare_StructTests,   apzVms_Forward_Declare_StructPatch, 0 },
+
+  {  zVms_No_64bit_GetoptName,    zVms_No_64bit_GetoptList,
+     apzVms_No_64bit_GetoptMachs,
+     VMS_NO_64BIT_GETOPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_No_64bit_GetoptTests,   apzVms_No_64bit_GetoptPatch, 0 },
+
+  {  zVms_Use_Fast_SetjmpName,    zVms_Use_Fast_SetjmpList,
+     apzVms_Use_Fast_SetjmpMachs,
+     VMS_USE_FAST_SETJMP_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_Use_Fast_SetjmpTests,   apzVms_Use_Fast_SetjmpPatch, 0 },
+
+  {  zVms_Use_Pragma_Extern_ModelName,    zVms_Use_Pragma_Extern_ModelList,
+     apzVms_Use_Pragma_Extern_ModelMachs,
+     VMS_USE_PRAGMA_EXTERN_MODEL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_Use_Pragma_Extern_ModelTests,   apzVms_Use_Pragma_Extern_ModelPatch, 0 },
+
+  {  zVms_Use_Quoted_IncludeName,    zVms_Use_Quoted_IncludeList,
+     apzVms_Use_Quoted_IncludeMachs,
+     VMS_USE_QUOTED_INCLUDE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVms_Use_Quoted_IncludeTests,   apzVms_Use_Quoted_IncludePatch, 0 },
+
   {  zVoid_NullName,    zVoid_NullList,
      apzVoid_NullMachs,
      VOID_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9788,6 +11635,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      VXWORKS_GCC_PROBLEM_TEST_CT, FD_MACH_ONLY,
      aVxworks_Gcc_ProblemTests,   apzVxworks_Gcc_ProblemPatch, 0 },
 
+  {  zVxworks_Ioctl_MacroName,    zVxworks_Ioctl_MacroList,
+     apzVxworks_Ioctl_MacroMachs,
+     VXWORKS_IOCTL_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVxworks_Ioctl_MacroTests,   apzVxworks_Ioctl_MacroPatch, 0 },
+
+  {  zVxworks_Mkdir_MacroName,    zVxworks_Mkdir_MacroList,
+     apzVxworks_Mkdir_MacroMachs,
+     VXWORKS_MKDIR_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVxworks_Mkdir_MacroTests,   apzVxworks_Mkdir_MacroPatch, 0 },
+
   {  zVxworks_Needs_VxtypesName,    zVxworks_Needs_VxtypesList,
      apzVxworks_Needs_VxtypesMachs,
      VXWORKS_NEEDS_VXTYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9798,11 +11655,26 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      VXWORKS_NEEDS_VXWORKS_TEST_CT, FD_MACH_ONLY,
      aVxworks_Needs_VxworksTests,   apzVxworks_Needs_VxworksPatch, 0 },
 
+  {  zVxworks_RegsName,    zVxworks_RegsList,
+     apzVxworks_RegsMachs,
+     VXWORKS_REGS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVxworks_RegsTests,   apzVxworks_RegsPatch, 0 },
+
   {  zVxworks_TimeName,    zVxworks_TimeList,
      apzVxworks_TimeMachs,
      VXWORKS_TIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aVxworks_TimeTests,   apzVxworks_TimePatch, 0 },
 
+  {  zVxworks_Write_ConstName,    zVxworks_Write_ConstList,
+     apzVxworks_Write_ConstMachs,
+     VXWORKS_WRITE_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVxworks_Write_ConstTests,   apzVxworks_Write_ConstPatch, 0 },
+
+  {  zVxworks_Iolib_Include_UnistdName,    zVxworks_Iolib_Include_UnistdList,
+     apzVxworks_Iolib_Include_UnistdMachs,
+     VXWORKS_IOLIB_INCLUDE_UNISTD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aVxworks_Iolib_Include_UnistdTests,   apzVxworks_Iolib_Include_UnistdPatch, 0 },
+
   {  zX11_ClassName,    zX11_ClassList,
      apzX11_ClassMachs,
      X11_CLASS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,