OSDN Git Service

Apply https://gcc.gnu.org/ml/gcc-patches/2012-09/msg00777/aarch64-int-iterators-backp...
[pf3gnuchains/gcc-fork.git] / fixincludes / fixincl.x
index 9da7530..e6d07d8 100644 (file)
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Wednesday February 20, 2008 at 05:10:00 AM CET
+ * It has been AutoGen-ed  March 26, 2012 at 10:53:21 AM by AutoGen 5.10
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Feb 20 05:10:00 CET 2008
+/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Mar 26 10:53:21 EDT 2012
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
  * 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 212 fixup descriptions.
+ * This file contains 224 fixup descriptions.
  *
  * See README for more information.
  *
- *  inclhack copyright (c) 1998, 1999, 2000, 2001
+ *  inclhack copyright (c) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ *                         2006, 2007, 2008
  *  The Free Software Foundation, Inc.
  *
-  *  inclhack is free software.
+ *  inclhack is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
  *  
- *  You may redistribute it and/or modify it under the terms of the
- *  GNU General Public License, as published by the Free Software
- *  Foundation; either version 2 of the License, or (at your option)
- *  any later version.
- *  
- *  inclhack is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  inclhack is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *  See the GNU General Public License for more details.
  *  
- *  You should have received a copy of the GNU General Public License
- *  along with inclhack.  If not, write to:
- *     The Free Software Foundation, Inc.,
- *     51 Franklin Street, Fifth Floor
- *     Boston, MA  02110-1301, USA.
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef SED_PROGRAM
+#define SED_PROGRAM "/usr/bin/sed"
+#endif
+static char const sed_cmd_z[] = SED_PROGRAM;
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aab_Aix_Stdio fix
+ */
+tSCC zAab_Aix_StdioName[] =
+     "AAB_aix_stdio";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAab_Aix_StdioList[] =
+  "stdio.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAab_Aix_StdioMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAab_Aix_StdioSelect0[] =
+       "define fopen fopen64";
+
+#define    AAB_AIX_STDIO_TEST_CT  1
+static tTestDesc aAab_Aix_StdioTests[] = {
+  { TT_EGREP,    zAab_Aix_StdioSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aab_Aix_Stdio
  */
+static const char* apzAab_Aix_StdioPatch[] = {
+    "wrap",
+    "",
+    "\n\
+#if defined __GNUG__ && defined _LARGE_FILES && defined __cplusplus\n\
+#define __need__aix_stdio_h_fix\n\
+#ifdef __need__aix_stdio_h_fix\n\
+#undef fseeko\n\
+#undef ftello\n\
+#undef fgetpos\n\
+#undef fsetpos\n\
+#undef fopen\n\
+#undef freopen\n\
+/* Alias the symbols using asm */\n\
+extern \"C\" {\n\
+extern int fgetpos(FILE *, fpos64_t *) __asm__(\"fgetpos64\");\n\
+extern FILE *fopen(const char *, const char *) __asm__(\"fopen64\");\n\
+extern FILE *freopen(const char *, const char *, FILE *) __asm__(\"freopen64\");\n\
+extern int fseeko(FILE *, off64_t, int) __asm__(\"fseeko64\");\n\
+extern int fsetpos(FILE *, const fpos64_t *) __asm__(\"fsetpos64\");\n\
+extern off64_t ftello(FILE *) __asm__(\"ftello64\");\n\
+}\n\
+#endif\n\
+#endif\n",
+    (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
@@ -219,11 +277,14 @@ tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass0[] =
        "} while";
 tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass1[] =
        "x86_64";
+tSCC zAab_Fd_Zero_Asm_Posix_Types_HBypass2[] =
+       "posix_types_64";
 
-#define    AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT  2
+#define    AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT  3
 static tTestDesc aAab_Fd_Zero_Asm_Posix_Types_HTests[] = {
   { TT_NEGREP,   zAab_Fd_Zero_Asm_Posix_Types_HBypass0, (regex_t*)NULL },
-  { TT_NEGREP,   zAab_Fd_Zero_Asm_Posix_Types_HBypass1, (regex_t*)NULL }, };
+  { TT_NEGREP,   zAab_Fd_Zero_Asm_Posix_Types_HBypass1, (regex_t*)NULL },
+  { TT_NEGREP,   zAab_Fd_Zero_Asm_Posix_Types_HBypass2, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Aab_Fd_Zero_Asm_Posix_Types_H
@@ -419,277 +480,196 @@ static const char* apzAab_Sun_MemcpyPatch[] = {
     extern char *memset();\n\
   #endif /* __STDC__ */\n\n\
   extern int memcmp();\n\n\
-#endif /* __memory_h__ */\n\
-_EndOfHeader;\n\
-};\n\n\n\
-/*\n\
- *  Completely replace <sys/varargs.h> with a file that includes gcc's\n\
- *  stdarg.h or varargs.h files as appropriate.\n\
- */\n\
-#ifdef SVR4\n\
-fix = {\n\
-    hackname = AAB_svr4_no_varargs;\n\
-    files    = sys/varargs.h;\n\
-    replace  = \"/* This file was generated by fixincludes.  */\\n\"\n\
-               \"#ifndef _SYS_VARARGS_H\\n\"\n\
-               \"#define _SYS_VARARGS_H\\n\\n\"\n\n\
-               \"#ifdef __STDC__\\n\"\n\
-               \"#include <stdarg.h>\\n\"\n\
-               \"#else\\n\"\n\
-               \"#include <varargs.h>\\n\"\n\
-               \"#endif\\n\\n\"\n\n\
-               \"#endif  /* _SYS_VARARGS_H */\\n\";\n\
-};\n\
-#endif\n\n\n\
-/*\n\
- *  Completely replace <sys/byteorder.h> with a file that implements gcc's\n\
- *  optimized byteswapping.  (The original probably implemented some\n\
- *  incompatible optimized byteswapping.)\n\
- */\n\
-fix = {\n\
-    hackname = AAB_svr4_replace_byteorder;\n\
-    mach     = \"*-*-sysv4*\";\n\
-    mach     = \"i[34567]86-*-sysv5*\";\n\
-    mach     = \"i[34567]86-*-sco3.2v5*\";\n\
-    mach     = \"i[34567]86-*-udk*\";\n\
-    mach     = \"i[34567]86-*-solaris2.[0-4]\";\n\
-    mach     = \"powerpcle-*-solaris2.[0-4]\";\n\
-    mach     = \"sparc-*-solaris2.[0-4]\";\n\
-    mach     = \"i[34567]86-sequent-ptx*\";\n\
-    files    = sys/byteorder.h;\n\
-    replace  = <<-  _EndOfHeader_\n\
-#ifndef _SYS_BYTEORDER_H\n\
-#define _SYS_BYTEORDER_H\n\n\
-/* Functions to convert `short' and `long' quantities from host byte order\n\
-   to (internet) network byte order (i.e. big-endian).\n\n\
-   Written by Ron Guilmette (rfg@ncd.com).\n\n\
-   This isn't actually used by GCC.  It is installed by fixinc.svr4.\n\n\
-   For big-endian machines these functions are essentially no-ops.\n\n\
-   For little-endian machines, we define the functions using specialized\n\
-   asm sequences in cases where doing so yields better code (e.g. i386).  */\n\n\
-#if !defined (__GNUC__) && !defined (__GNUG__)\n\
-  #error You lose!  This file is only useful with GNU compilers.\n\
-#endif\n\n\
-#ifndef __BYTE_ORDER__\n\
-  /* Byte order defines.  These are as defined on UnixWare 1.1, but with\n\
-     double underscores added at the front and back.  */\n\
-  #define __LITTLE_ENDIAN__   1234\n\
-  #define __BIG_ENDIAN__      4321\n\
-  #define __PDP_ENDIAN__      3412\n\
-#endif\n\n\
-#ifdef __STDC__\n\
-  static __inline__ unsigned long htonl (unsigned long);\n\
-  static __inline__ unsigned short htons (unsigned int);\n\
-  static __inline__ unsigned long ntohl (unsigned long);\n\
-  static __inline__ unsigned short ntohs (unsigned int);\n\
-#endif /* defined (__STDC__) */\n\n\
-#if defined (__i386__)\n\n\
-  #ifndef __BYTE_ORDER__\n\
-    #define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\
-  #endif\n\n\
-  /* Convert a host long to a network long.  */\n\n\
-  /* We must use a new-style function definition, so that this will also\n\
-     be valid for C++.  */\n\
-  static __inline__ unsigned long\n\
-  htonl (unsigned long __arg)\n\
-  {\n\
-    register unsigned long __result;\n\n\
-    __asm__ (\"xchg%B0 %b0,%h0\n\
-  ror%L0 $16,%0\n\
-  xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\
-    return __result;\n\
-  }\n\n\
-  /* Convert a host short to a network short.  */\n\n\
-  static __inline__ unsigned short\n\
-  htons (unsigned int __arg)\n\
-  {\n\
-    register unsigned short __result;\n\n\
-    __asm__ (\"xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\
-    return __result;\n\
-  }\n\n\
-#elif (defined (__ns32k__) || defined (__vax__) || defined (__arm__))\n\n\
-  #ifndef __BYTE_ORDER__\n\
-    #define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\
-  #endif\n\n\
-  /* For other little-endian machines, using C code is just as efficient as\n\
-     using assembly code.  */\n\n\
-  /* Convert a host long to a network long.  */\n\n\
-  static __inline__ unsigned long\n\
-  htonl (unsigned long __arg)\n\
-  {\n\
-    register unsigned long __result;\n\n\
-    __result = (__arg >> 24) & 0x000000ff;\n\
-    __result |= (__arg >> 8) & 0x0000ff00;\n\
-    __result |= (__arg << 8) & 0x00ff0000;\n\
-    __result |= (__arg << 24) & 0xff000000;\n\
-    return __result;\n\
-  }\n\n\
-  /* Convert a host short to a network short.  */\n\n\
-  static __inline__ unsigned short\n\
-  htons (unsigned int __arg)\n\
-  {\n\
-    register unsigned short __result;\n\n\
-    __result = (__arg << 8) & 0xff00;\n\
-    __result |= (__arg >> 8) & 0x00ff;\n\
-    return __result;\n\
-  }\n\n\
-#else /* must be a big-endian machine */\n\n\
-  #ifndef __BYTE_ORDER__\n\
-    #define __BYTE_ORDER__ __BIG_ENDIAN__\n\
-  #endif\n\n\
-  /* Convert a host long to a network long.  */\n\n\
-  static __inline__ unsigned long\n\
-  htonl (unsigned long __arg)\n\
-  {\n\
-    return __arg;\n\
-  }\n\n\
-  /* Convert a host short to a network short.  */\n\n\
-  static __inline__ unsigned short\n\
-  htons (unsigned int __arg)\n\
-  {\n\
-    return __arg;\n\
-  }\n\n\
-#endif /* big-endian */\n\n\
-/* Convert a network long to a host long.  */\n\n\
-static __inline__ unsigned long\n\
-ntohl (unsigned long __arg)\n\
-{\n\
-  return htonl (__arg);\n\
-}\n\n\
-/* Convert a network short to a host short.  */\n\n\
-static __inline__ unsigned short\n\
-ntohs (unsigned int __arg)\n\
-{\n\
-  return htons (__arg);\n\
-}\n\
-#endif",
+#endif /* __memory_h__ */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aab_Ultrix_Ansi_Compat fix
+ *  Description of Aix_Complex fix
  */
-tSCC zAab_Ultrix_Ansi_CompatName[] =
-     "AAB_ultrix_ansi_compat";
+tSCC zAix_ComplexName[] =
+     "aix_complex";
 
 /*
  *  File name selection pattern
  */
-tSCC zAab_Ultrix_Ansi_CompatList[] =
-  "ansi_compat.h\0";
+tSCC zAix_ComplexList[] =
+  "complex.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAab_Ultrix_Ansi_CompatMachs (const char**)NULL
+tSCC* apzAix_ComplexMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAab_Ultrix_Ansi_CompatSelect0[] =
-       "ULTRIX";
+tSCC zAix_ComplexSelect0[] =
+       "#define[ \t]_Complex_I[ \t]__I";
 
-#define    AAB_ULTRIX_ANSI_COMPAT_TEST_CT  1
-static tTestDesc aAab_Ultrix_Ansi_CompatTests[] = {
-  { TT_EGREP,    zAab_Ultrix_Ansi_CompatSelect0, (regex_t*)NULL }, };
+#define    AIX_COMPLEX_TEST_CT  1
+static tTestDesc aAix_ComplexTests[] = {
+  { TT_EGREP,    zAix_ComplexSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Aab_Ultrix_Ansi_Compat
+ *  Fix Command Arguments for Aix_Complex
  */
-static const char* apzAab_Ultrix_Ansi_CompatPatch[] = {
-"/* This file intentionally left blank.  */\n",
+static const char* apzAix_ComplexPatch[] = {
+    "format",
+    "#define _Complex_I (__extension__ 1.0iF)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aab_Ultrix_Limits fix
+ *  Description of Aix_Malloc fix
  */
-tSCC zAab_Ultrix_LimitsName[] =
-     "AAB_ultrix_limits";
+tSCC zAix_MallocName[] =
+     "aix_malloc";
 
 /*
  *  File name selection pattern
  */
-tSCC zAab_Ultrix_LimitsList[] =
-  "limits.h\0";
+tSCC zAix_MallocList[] =
+  "malloc.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAab_Ultrix_LimitsMachs[] = {
-        "*-*-ultrix4.3",
+tSCC* apzAix_MallocMachs[] = {
+        "*-*-aix*",
         (const char*)NULL };
-#define AAB_ULTRIX_LIMITS_TEST_CT  0
-#define aAab_Ultrix_LimitsTests   (tTestDesc*)NULL
 
 /*
- *  Fix Command Arguments for Aab_Ultrix_Limits
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_MallocSelect0[] =
+       "#ifdef __cplusplus";
+
+#define    AIX_MALLOC_TEST_CT  1
+static tTestDesc aAix_MallocTests[] = {
+  { TT_EGREP,    zAix_MallocSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Malloc
  */
-static const char* apzAab_Ultrix_LimitsPatch[] = {
-"#ifndef _LIMITS_INCLUDED\n\
-  #define _LIMITS_INCLUDED\n\
-  #include <sys/limits.h>\n\
-#endif /* _LIMITS_INCLUDED */",
+static const char* apzAix_MallocPatch[] = {
+    "format",
+    "#if (defined(__cplusplus) && defined(__IBMCPP__))",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aab_Ultrix_Memory fix
+ *  Description of Aix_Net_If_Arp fix
  */
-tSCC zAab_Ultrix_MemoryName[] =
-     "AAB_ultrix_memory";
+tSCC zAix_Net_If_ArpName[] =
+     "aix_net_if_arp";
 
 /*
  *  File name selection pattern
  */
-tSCC zAab_Ultrix_MemoryList[] =
-  "memory.h\0";
+tSCC zAix_Net_If_ArpList[] =
+  "net/if_arp.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAab_Ultrix_MemoryMachs[] = {
-        "*-*-ultrix4.3",
+tSCC* apzAix_Net_If_ArpMachs[] = {
+        "*-*-aix*",
         (const char*)NULL };
-#define AAB_ULTRIX_MEMORY_TEST_CT  0
-#define aAab_Ultrix_MemoryTests   (tTestDesc*)NULL
 
 /*
- *  Fix Command Arguments for Aab_Ultrix_Memory
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Net_If_ArpSelect0[] =
+       "^struct  fc_softc \\{";
+
+#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_Net_If_Arp
  */
-static const char* apzAab_Ultrix_MemoryPatch[] = {
-"#ifndef _MEMORY_INCLUDED\n\
-  #define _MEMORY_INCLUDED\n\
-  #include <strings.h>\n\
-#endif /* _MEMORY_INCLUDED */",
+static const char* apzAix_Net_If_ArpPatch[] = {
+    "format",
+    "typedef struct _fc_softc {",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aab_Ultrix_String fix
+ *  Description of Aix_Once_Init_1 fix
  */
-tSCC zAab_Ultrix_StringName[] =
-     "AAB_ultrix_string";
+tSCC zAix_Once_Init_1Name[] =
+     "aix_once_init_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zAab_Ultrix_StringList[] =
-  "string.h\0";
+tSCC zAix_Once_Init_1List[] =
+  "pthread.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Once_Init_1Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Once_Init_1Select0[] =
+       "#define[ \t]PTHREAD_ONCE_INIT \\\\\n\
+\\{ \\\\\n";
+
+#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 Aix_Once_Init_1
+ */
+static const char* apzAix_Once_Init_1Patch[] = {
+    "format",
+    "#define PTHREAD_ONCE_INIT \\\n\
+{{ \\\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Once_Init_2 fix
+ */
+tSCC zAix_Once_Init_2Name[] =
+     "aix_once_init_2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Once_Init_2List[] =
+  "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzAab_Ultrix_StringMachs[] = {
-        "*-*-ultrix4.3",
+tSCC* apzAix_Once_Init_2Machs[] = {
+        "*-*-aix*",
         (const char*)NULL };
-#define AAB_ULTRIX_STRING_TEST_CT  0
-#define aAab_Ultrix_StringTests   (tTestDesc*)NULL
 
 /*
- *  Fix Command Arguments for Aab_Ultrix_String
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Once_Init_2Select0[] =
+       "[ \t]0 \\\\\n\
+\\}\n";
+
+#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 Aix_Once_Init_2
  */
-static const char* apzAab_Ultrix_StringPatch[] = {
-"#ifndef _STRING_INCLUDED\n\
-  #define _STRING_INCLUDED\n\
-  #include <strings.h>\n\
-#endif /* _STRING_INCLUDED */",
+static const char* apzAix_Once_Init_2Patch[] = {
+    "format",
+    "\t0 \\\n\
+}}\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -731,76 +711,250 @@ static const char* apzAix_PthreadPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Sysmachine fix
+ *  Description of Aix_Stdint_1 fix
  */
-tSCC zAix_SysmachineName[] =
-     "aix_sysmachine";
+tSCC zAix_Stdint_1Name[] =
+     "aix_stdint_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zAix_SysmachineList[] =
-  "sys/machine.h\0";
+tSCC zAix_Stdint_1List[] =
+  "stdint-aix.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAix_SysmachineMachs (const char**)NULL
+tSCC* apzAix_Stdint_1Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAix_SysmachineSelect0[] =
-       "\\\\ +\n";
+tSCC zAix_Stdint_1Select0[] =
+       "#define[ \t]UINT8_MAX[ \t]\\(255U\\)\n\
+#define[ \t]UINT16_MAX[ \t]\\(65535U\\)";
 
-#define    AIX_SYSMACHINE_TEST_CT  1
-static tTestDesc aAix_SysmachineTests[] = {
-  { TT_EGREP,    zAix_SysmachineSelect0, (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 Aix_Sysmachine
+ *  Fix Command Arguments for Aix_Stdint_1
  */
-static const char* apzAix_SysmachinePatch[] = {
+static const char* apzAix_Stdint_1Patch[] = {
     "format",
-    "\\\n",
+    "#define UINT8_MAX\t(255)\n\
+#define UINT16_MAX\t(65535)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aix_Syswait fix
+ *  Description of Aix_Stdint_2 fix
  */
-tSCC zAix_SyswaitName[] =
-     "aix_syswait";
+tSCC zAix_Stdint_2Name[] =
+     "aix_stdint_2";
 
 /*
  *  File name selection pattern
  */
-tSCC zAix_SyswaitList[] =
-  "sys/wait.h\0";
+tSCC zAix_Stdint_2List[] =
+  "stdint-aix.h\0stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAix_SyswaitMachs (const char**)NULL
+tSCC* apzAix_Stdint_2Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAix_SyswaitSelect0[] =
-       "^extern pid_t wait3\\(\\);\n";
-tSCC zAix_SyswaitSelect1[] =
-       "bos325,";
+tSCC zAix_Stdint_2Select0[] =
+       "#define[ \t]INTPTR_MIN[ \t]INT64_MIN\n\
+#define[ \t]INTPTR_MAX[ \t]INT64_MAX\n\
+#define[ \t]UINTPTR_MAX[ \t]UINT64_MAX\n\
+#else\n\
+#define[ \t]INTPTR_MIN[ \t]INT32_MIN\n\
+#define[ \t]INTPTR_MAX[ \t]INT32_MAX\n\
+#define[ \t]UINTPTR_MAX[ \t]UINT32_MAX";
 
-#define    AIX_SYSWAIT_TEST_CT  2
-static tTestDesc aAix_SyswaitTests[] = {
-  { TT_EGREP,    zAix_SyswaitSelect0, (regex_t*)NULL },
-  { TT_EGREP,    zAix_SyswaitSelect1, (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 Aix_Syswait
+ *  Fix Command Arguments for Aix_Stdint_2
  */
-static const char* apzAix_SyswaitPatch[] = {
+static const char* apzAix_Stdint_2Patch[] = {
     "format",
-    "struct rusage;\n\
-%0",
+    "#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 Aix_Stdint_3 fix
+ */
+tSCC zAix_Stdint_3Name[] =
+     "aix_stdint_3";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Stdint_3List[] =
+  "stdint-aix.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Stdint_3Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Stdint_3Select0[] =
+       "#define[ \t]PTRDIFF_MIN[ \t]INT64_MIN\n\
+#define[ \t]PTRDIFF_MAX[ \t]INT64_MAX\n\
+#else\n\
+#define[ \t]PTRDIFF_MIN[ \t]*INT32_MIN\n\
+#define[ \t]PTRDIFF_MAX[ \t]*INT32_MAX";
+
+#define    AIX_STDINT_3_TEST_CT  1
+static tTestDesc aAix_Stdint_3Tests[] = {
+  { TT_EGREP,    zAix_Stdint_3Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Stdint_3
+ */
+static const char* apzAix_Stdint_3Patch[] = {
+    "format",
+    "#define PTRDIFF_MIN\t(-9223372036854775807L - 1)\n\
+#define PTRDIFF_MAX\t9223372036854775807L\n\
+#else\n\
+#define PTRDIFF_MIN\t(-2147483647L - 1)\n\
+#define PTRDIFF_MAX\t2147483647L",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Stdint_4 fix
+ */
+tSCC zAix_Stdint_4Name[] =
+     "aix_stdint_4";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Stdint_4List[] =
+  "stdint-aix.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Stdint_4Machs[] = {
+        "*-*-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";
+
+#define    AIX_STDINT_4_TEST_CT  1
+static tTestDesc aAix_Stdint_4Tests[] = {
+  { TT_EGREP,    zAix_Stdint_4Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Stdint_4
+ */
+static const char* apzAix_Stdint_4Patch[] = {
+    "format",
+    "#define SIZE_MAX\t18446744073709551615UL\n\
+#else\n\
+#define SIZE_MAX\t4294967295UL",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Stdint_5 fix
+ */
+tSCC zAix_Stdint_5Name[] =
+     "aix_stdint_5";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Stdint_5List[] =
+  "stdint-aix.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Stdint_5Machs[] = {
+        "*-*-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\\)";
+
+#define    AIX_STDINT_5_TEST_CT  1
+static tTestDesc aAix_Stdint_5Tests[] = {
+  { TT_EGREP,    zAix_Stdint_5Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Stdint_5
+ */
+static const char* apzAix_Stdint_5Patch[] = {
+    "format",
+    "#define UINT8_C(c)\tc\n\
+#define UINT16_C(c)\tc",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Sysmachine fix
+ */
+tSCC zAix_SysmachineName[] =
+     "aix_sysmachine";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_SysmachineList[] =
+  "sys/machine.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAix_SysmachineMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_SysmachineSelect0[] =
+       "\\\\ +\n";
+
+#define    AIX_SYSMACHINE_TEST_CT  1
+static tTestDesc aAix_SysmachineTests[] = {
+  { TT_EGREP,    zAix_SysmachineSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Sysmachine
+ */
+static const char* apzAix_SysmachinePatch[] = {
+    "format",
+    "\\\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -1041,7 +1195,7 @@ tSCC zAlpha_AssertList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zAlpha_AssertSelect0[] =
-       "(#define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
+       "(#[ \t]*define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
 
 #define    ALPHA_ASSERT_TEST_CT  1
 static tTestDesc aAlpha_AssertTests[] = {
@@ -1086,7 +1240,7 @@ static tTestDesc aAlpha_Bad_LvalTests[] = {
 /*
  *  Fix Command Arguments for Alpha_Bad_Lval
  */
-static const char* apzAlpha_Bad_LvalPatch[] = { "sed",
+static const char* apzAlpha_Bad_LvalPatch[] = { sed_cmd_z,
     "-e", "s/^[ \t]*#[ \t]*define[ \t][ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*\\(_.*\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/",
     (char*)NULL };
 
@@ -1127,6 +1281,41 @@ static const char* apzAlpha_GetoptPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Alpha_If_Semicolon fix
+ */
+tSCC zAlpha_If_SemicolonName[] =
+     "alpha_if_semicolon";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAlpha_If_SemicolonList[] =
+  "net/if.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAlpha_If_SemicolonMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAlpha_If_SemicolonSelect0[] =
+       "struct[ \t]+sockaddr[ \t]+vmif_paddr[ \t]+/\\*";
+
+#define    ALPHA_IF_SEMICOLON_TEST_CT  1
+static tTestDesc aAlpha_If_SemicolonTests[] = {
+  { TT_EGREP,    zAlpha_If_SemicolonSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Alpha_If_Semicolon
+ */
+static const char* apzAlpha_If_SemicolonPatch[] = {
+    "format",
+    "struct sockaddr vmif_paddr;\t/*",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Alpha_Parens fix
  */
 tSCC zAlpha_ParensName[] =
@@ -1271,7 +1460,7 @@ static tTestDesc aAlpha_Pthread_InitTests[] = {
 /*
  *  Fix Command Arguments for Alpha_Pthread_Init
  */
-static const char* apzAlpha_Pthread_InitPatch[] = { "sed",
+static const char* apzAlpha_Pthread_InitPatch[] = { sed_cmd_z,
     "-e", "s@MVALID\\(.*\\)A}@MVALID\\1A, 0, 0, 0, 0, 0, 0 }@\n\
 s@MVALID\\(.*\\)_}@MVALID\\1_, 0, 0, 0, 0 }@\n\
 s@CVALID\\(.*\\)A}@CVALID\\1A, 0, 0, 0, 0 }@\n\
@@ -1317,43 +1506,6 @@ static const char* apzAlpha_SbrkPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_Wchar fix
- */
-tSCC zAlpha_WcharName[] =
-     "alpha_wchar";
-
-/*
- *  File name selection pattern
- */
-tSCC zAlpha_WcharList[] =
-  "wchar.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAlpha_WcharMachs[] = {
-        "alpha*-dec-osf4*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAlpha_WcharSelect0[] =
-       "#define wcstok wcstok_r";
-
-#define    ALPHA_WCHAR_TEST_CT  1
-static tTestDesc aAlpha_WcharTests[] = {
-  { TT_EGREP,    zAlpha_WcharSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Alpha_Wchar
- */
-static const char* apzAlpha_WcharPatch[] = { "sed",
-    "-e", "s@#define wcstok wcstok_r@extern wchar_t *wcstok __((wchar_t *, const wchar_t *, wchar_t **)) __asm__(\"wcstok_r\");@",
-    "-e", "s@#define wcsftime __wcsftime_isoc@extern size_t   wcsftime __((wchar_t *, size_t, const wchar_t *, const struct tm *)) __asm__(\"__wcsftime_isoc\");@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Avoid_Bool_Define fix
  */
 tSCC zAvoid_Bool_DefineName[] =
@@ -1676,7 +1828,7 @@ static tTestDesc aBroken_CabsTests[] = {
 /*
  *  Fix Command Arguments for Broken_Cabs
  */
-static const char* apzBroken_CabsPatch[] = { "sed",
+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 };
@@ -1765,19 +1917,54 @@ int vfscanf(FILE *, const char *, __builtin_va_list) __asm__ (_BSD_STRING(__USER
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Ctrl_Quotes_Def fix
+ *  Description of Cdef_Cplusplus fix
  */
-tSCC zCtrl_Quotes_DefName[] =
-     "ctrl_quotes_def";
+tSCC zCdef_CplusplusName[] =
+     "cdef_cplusplus";
 
 /*
  *  File name selection pattern
  */
-#define zCtrl_Quotes_DefList (char*)NULL
+tSCC zCdef_CplusplusList[] =
+  "sys/cdefs.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzCtrl_Quotes_DefMachs (const char**)NULL
+#define apzCdef_CplusplusMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zCdef_CplusplusSelect0[] =
+       "\\[\\[noreturn\\]\\]";
+
+#define    CDEF_CPLUSPLUS_TEST_CT  1
+static tTestDesc aCdef_CplusplusTests[] = {
+  { TT_EGREP,    zCdef_CplusplusSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Cdef_Cplusplus
+ */
+static const char* apzCdef_CplusplusPatch[] = {
+    "format",
+    "__attribute__((__noreturn__))",
+    (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
@@ -2000,6 +2187,324 @@ static const char* apzDarwin_Private_ExternPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Darwin_Stdint_1 fix
+ */
+tSCC zDarwin_Stdint_1Name[] =
+     "darwin_stdint_1";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Stdint_1List[] =
+  "stdint-darwin.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_1Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Stdint_1Select0[] =
+       "#define UINT8_C\\(v\\)[ \t]+\\(v ## U\\)\n\
+#define UINT16_C\\(v\\)[ \t]+\\(v ## U\\)";
+
+#define    DARWIN_STDINT_1_TEST_CT  1
+static tTestDesc aDarwin_Stdint_1Tests[] = {
+  { TT_EGREP,    zDarwin_Stdint_1Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Stdint_1
+ */
+static const char* apzDarwin_Stdint_1Patch[] = {
+    "format",
+    "#define UINT8_C(v)\tv\n\
+#define UINT16_C(v)\tv",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Stdint_2 fix
+ */
+tSCC zDarwin_Stdint_2Name[] =
+     "darwin_stdint_2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Stdint_2List[] =
+  "stdint-darwin.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_2Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Stdint_2Select0[] =
+       "#if __WORDSIZE == 64\n\
+#define INTPTR_MIN[ \t]+INT64_MIN\n\
+#define INTPTR_MAX[ \t]+INT64_MAX\n\
+#else\n\
+#define INTPTR_MIN[ \t]+INT32_MIN\n\
+#define INTPTR_MAX[ \t]+INT32_MAX\n\
+#endif";
+
+#define    DARWIN_STDINT_2_TEST_CT  1
+static tTestDesc aDarwin_Stdint_2Tests[] = {
+  { TT_EGREP,    zDarwin_Stdint_2Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Stdint_2
+ */
+static const char* apzDarwin_Stdint_2Patch[] = {
+    "format",
+    "#if __WORDSIZE == 64\n\
+#define INTPTR_MAX 9223372036854775807L\n\
+#define INTPTR_MIN (-INTPTR_MAX-1)\n\
+#else\n\
+#define INTPTR_MAX 2147483647L\n\
+#define INTPTR_MIN (-INTPTR_MAX-1)\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Stdint_3 fix
+ */
+tSCC zDarwin_Stdint_3Name[] =
+     "darwin_stdint_3";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Stdint_3List[] =
+  "stdint-darwin.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_3Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Stdint_3Select0[] =
+       "#if __WORDSIZE == 64\n\
+#define UINTPTR_MAX[ \t]+UINT64_MAX\n\
+#else\n\
+#define UINTPTR_MAX[ \t]+UINT32_MAX\n\
+#endif";
+
+#define    DARWIN_STDINT_3_TEST_CT  1
+static tTestDesc aDarwin_Stdint_3Tests[] = {
+  { TT_EGREP,    zDarwin_Stdint_3Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Stdint_3
+ */
+static const char* apzDarwin_Stdint_3Patch[] = {
+    "format",
+    "#if __WORDSIZE == 64\n\
+#define UINTPTR_MAX 18446744073709551615UL\n\
+#else\n\
+#define UINTPTR_MAX 4294967295UL\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Stdint_4 fix
+ */
+tSCC zDarwin_Stdint_4Name[] =
+     "darwin_stdint_4";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Stdint_4List[] =
+  "stdint-darwin.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_4Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Stdint_4Select0[] =
+       "#if __WORDSIZE == 64\n\
+#define SIZE_MAX[ \t]+UINT64_MAX\n\
+#else\n\
+#define SIZE_MAX[ \t]+UINT32_MAX\n\
+#endif";
+
+#define    DARWIN_STDINT_4_TEST_CT  1
+static tTestDesc aDarwin_Stdint_4Tests[] = {
+  { TT_EGREP,    zDarwin_Stdint_4Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Stdint_4
+ */
+static const char* apzDarwin_Stdint_4Patch[] = {
+    "format",
+    "#if __WORDSIZE == 64\n\
+#define SIZE_MAX 18446744073709551615UL\n\
+#else\n\
+#define SIZE_MAX 4294967295UL\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Stdint_5 fix
+ */
+tSCC zDarwin_Stdint_5Name[] =
+     "darwin_stdint_5";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Stdint_5List[] =
+  "stdint-darwin.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_5Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Stdint_5Select0[] =
+       "#define INTMAX_MIN[ \t]+INT64_MIN\n\
+#define INTMAX_MAX[ \t]+INT64_MAX\n\n\
+#define UINTMAX_MAX[ \t]+UINT64_MAX";
+
+#define    DARWIN_STDINT_5_TEST_CT  1
+static tTestDesc aDarwin_Stdint_5Tests[] = {
+  { TT_EGREP,    zDarwin_Stdint_5Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Stdint_5
+ */
+static const char* apzDarwin_Stdint_5Patch[] = {
+    "format",
+    "#if __WORDSIZE == 64\n\
+#define INTMAX_MIN   (-9223372036854775807L - 1)\n\
+#define INTMAX_MAX   9223372036854775807L\n\
+#define UINTMAX_MAX  18446744073709551615UL\n\
+#else\n\
+#define INTMAX_MIN   (-9223372036854775807LL - 1)\n\
+#define INTMAX_MAX   9223372036854775807LL\n\
+#define UINTMAX_MAX  18446744073709551615ULL\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Stdint_6 fix
+ */
+tSCC zDarwin_Stdint_6Name[] =
+     "darwin_stdint_6";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Stdint_6List[] =
+  "stdint-darwin.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_6Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Stdint_6Select0[] =
+       "#if __WORDSIZE == 64\n\
+#define PTRDIFF_MIN[ \t]+INT64_MIN\n\
+#define PTRDIFF_MAX[ \t]+INT64_MAX\n\
+#else\n\
+#define PTRDIFF_MIN[ \t]+INT32_MIN\n\
+#define PTRDIFF_MAX[ \t]+INT32_MAX\n\
+#endif";
+
+#define    DARWIN_STDINT_6_TEST_CT  1
+static tTestDesc aDarwin_Stdint_6Tests[] = {
+  { TT_EGREP,    zDarwin_Stdint_6Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Stdint_6
+ */
+static const char* apzDarwin_Stdint_6Patch[] = {
+    "format",
+    "#if __WORDSIZE == 64\n\
+#define PTRDIFF_MIN (-9223372036854775807L - 1)\n\
+#define PTRDIFF_MAX 9223372036854775807L\n\
+#else\n\
+#define PTRDIFF_MIN (-2147483647 - 1)\n\
+#define PTRDIFF_MAX 2147483647\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Stdint_7 fix
+ */
+tSCC zDarwin_Stdint_7Name[] =
+     "darwin_stdint_7";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Stdint_7List[] =
+  "stdint-darwin.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_7Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Stdint_7Select0[] =
+       "#define INTMAX_C\\(v\\)[ \t]+\\(v ## LL\\)\n\
+#define UINTMAX_C\\(v\\)[ \t]+\\(v ## ULL\\)";
+
+#define    DARWIN_STDINT_7_TEST_CT  1
+static tTestDesc aDarwin_Stdint_7Tests[] = {
+  { TT_EGREP,    zDarwin_Stdint_7Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Stdint_7
+ */
+static const char* apzDarwin_Stdint_7Patch[] = {
+    "format",
+    "#if __WORDSIZE == 64\n\
+#define INTMAX_C(v)  (v ## L)\n\
+#define UINTMAX_C(v) (v ## UL)\n\
+#else\n\
+#define INTMAX_C(v)  (v ## LL)\n\
+#define UINTMAX_C(v) (v ## ULL)\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Dec_Intern_Asm fix
  */
 tSCC zDec_Intern_AsmName[] =
@@ -2020,7 +2525,7 @@ tSCC zDec_Intern_AsmList[] =
 /*
  *  Fix Command Arguments for Dec_Intern_Asm
  */
-static const char* apzDec_Intern_AsmPatch[] = { "sed",
+static const char* apzDec_Intern_AsmPatch[] = { sed_cmd_z,
     "-e", "/^[ \t]*float[ \t]*fasm/i\\\n\
 #ifdef __DECC\n",
     "-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n\
@@ -2107,48 +2612,6 @@ static const char* apzEcd_CursorPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Exception_Structure fix
- */
-tSCC zException_StructureName[] =
-     "exception_structure";
-
-/*
- *  File name selection pattern
- */
-tSCC zException_StructureList[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzException_StructureMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zException_StructureSelect0[] =
-       "matherr";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zException_StructureBypass0[] =
-       "matherr.*(struct exception|__MATH_EXCEPTION|[ \\t]*__FP_EXCEPTION[ \\t]*\\*[ \\t]*)";
-
-#define    EXCEPTION_STRUCTURE_TEST_CT  2
-static tTestDesc aException_StructureTests[] = {
-  { TT_NEGREP,   zException_StructureBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zException_StructureSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Exception_Structure
- */
-static const char* apzException_StructurePatch[] = {
-    "wrap",
-    "struct exception;\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Freebsd_Gcc3_Breakage fix
  */
 tSCC zFreebsd_Gcc3_BreakageName[] =
@@ -2330,12 +2793,24 @@ static tTestDesc aGlibc_C99_Inline_2Tests[] = {
 /*
  *  Fix Command Arguments for Glibc_C99_Inline_2
  */
-static const char* apzGlibc_C99_Inline_2Patch[] = { "sed",
-    "-e", "s/extern int \\(stat\\|lstat\\|fstat\\|mknod\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
+static const char* apzGlibc_C99_Inline_2Patch[] = { sed_cmd_z,
+    "-e", "s/extern int \\(stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
+extern\\\n\
+#endif\\\n\
+__inline__ int \\1/",
+    "-e", "s/extern int \\([lf]stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
 extern\\\n\
 #endif\\\n\
 __inline__ int \\1/",
-    "-e", "s/extern int __REDIRECT\\(_NTH\\|\\) (\\(stat\\|lstat\\|fstat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
+    "-e", "s/extern int \\(mknod\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
+extern\\\n\
+#endif\\\n\
+__inline__ int \\1/",
+    "-e", "s/extern int __REDIRECT\\(_NTH\\)\\{0,1\\} (\\(stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
+extern\\\n\
+#endif\\\n\
+__inline__ int __REDIRECT\\1 (\\2/",
+    "-e", "s/extern int __REDIRECT\\(_NTH\\)\\{0,1\\} (\\([lf]stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
 extern\\\n\
 #endif\\\n\
 __inline__ int __REDIRECT\\1 (\\2/",
@@ -2460,47 +2935,180 @@ static tTestDesc aGlibc_Mutex_InitTests[] = {
 /*
  *  Fix Command Arguments for Glibc_Mutex_Init
  */
-static const char* apzGlibc_Mutex_InitPatch[] = { "sed",
-    "-e", "/define[ \t]\\+PTHREAD_MUTEX_INITIALIZER[ \t]*\\\\/,+1s/{ { 0, } }/{ { 0, 0, 0, 0, 0, 0 } }/",
-    "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\|ERRORCHECK\\|ADAPTIVE\\)_NP\\) }/{ \\1, 0 }/",
-    "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\|ERRORCHECK\\|ADAPTIVE\\)_NP\\) }/{ \\1, 0, 0 }/",
-    "-e", "/define[ \t]\\+PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\/N;s/^[ \t]*#[ \t]*\\(define[ \t]\\+PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\\\)\\n[ \t]*{ { 0, } }/# if __WORDSIZE == 64\\n#  \\1\\n  { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }\\n# else\\n#  \\1\\n  { { 0, 0, 0, 0, 0, 0, 0, 0 } }\\n# endif/",
+static const char* apzGlibc_Mutex_InitPatch[] = { sed_cmd_z,
+    "-e", "/define[ \t]\\{1,\\}PTHREAD_MUTEX_INITIALIZER[ \t]*\\\\/{\n\
+N\n\
+s/{ { 0, } }/{ { 0, 0, 0, 0, 0, 0 } }/\n\
+}",
+    "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\)_NP\\) }/{ \\1, 0 }/",
+    "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(ERRORCHECK\\)_NP\\) }/{ \\1, 0 }/",
+    "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(ADAPTIVE\\)_NP\\) }/{ \\1, 0 }/",
+    "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\)_NP\\) }/{ \\1, 0, 0 }/",
+    "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(ERRORCHECK\\)_NP\\) }/{ \\1, 0, 0 }/",
+    "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(ADAPTIVE\\)_NP\\) }/{ \\1, 0, 0 }/",
+    "-e", "/define[ \t]\\{1,\\}PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\/N;s/^[ \t]*#[ \t]*\\(define[ \t]\\{1,\\}PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\\\)\\n[ \t]*{ { 0, } }/# if __WORDSIZE == 64\\\n\
+#  \\1\\\n\
+  { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }\\\n\
+# else\\\n\
+#  \\1\\\n\
+  { { 0, 0, 0, 0, 0, 0, 0, 0 } }\\\n\
+# endif/",
     "-e", "s/{ \\(0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP\\) }/{ \\1, 0 }/",
-    "-e", "/define[ \t]\\+PTHREAD_COND_INITIALIZER/s/{ { 0, } }/{ { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }/",
+    "-e", "/define[ \t]\\{1,\\}PTHREAD_COND_INITIALIZER/s/{ { 0, } }/{ { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Gnu_Types fix
+ *  Description of Glibc_Stdint fix
  */
-tSCC zGnu_TypesName[] =
-     "gnu_types";
+tSCC zGlibc_StdintName[] =
+     "glibc_stdint";
 
 /*
  *  File name selection pattern
  */
-tSCC zGnu_TypesList[] =
-  "sys/types.h\0stdlib.h\0sys/stdtypes.h\0stddef.h\0memory.h\0unistd.h\0";
+tSCC zGlibc_StdintList[] =
+  "stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzGnu_TypesMachs[] = {
-        "*-*-solaris2.1[0-9]*",
-        (const char*)NULL };
+#define apzGlibc_StdintMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zGnu_TypesSelect0[] =
-       "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;";
+tSCC zGlibc_StdintSelect0[] =
+       "GNU C Library";
+
+#define    GLIBC_STDINT_TEST_CT  1
+static tTestDesc aGlibc_StdintTests[] = {
+  { TT_EGREP,    zGlibc_StdintSelect0, (regex_t*)NULL }, };
 
 /*
- *  content bypass pattern - skip fix if pattern found
+ *  Fix Command Arguments for Glibc_Stdint
  */
-tSCC zGnu_TypesBypass0[] =
-       "_GCC_(PTRDIFF|SIZE|WCHAR)_T";
+static const char* apzGlibc_StdintPatch[] = {
+    "format",
+    "# define UINT8_C(c)\tc\n\
+# define UINT16_C(c)\tc",
+    "# define UINT8_C\\(c\\)\tc ## U\n\
+# define UINT16_C\\(c\\)\tc ## U",
+    (char*)NULL };
 
-#define    GNU_TYPES_TEST_CT  2
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Glibc_Strncpy fix
+ */
+tSCC zGlibc_StrncpyName[] =
+     "glibc_strncpy";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zGlibc_StrncpyList[] =
+  "bits/string2.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzGlibc_StrncpyMachs (const char**)NULL
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zGlibc_StrncpyBypass0[] =
+       "__builtin_strncpy";
+
+#define    GLIBC_STRNCPY_TEST_CT  1
+static tTestDesc aGlibc_StrncpyTests[] = {
+  { TT_NEGREP,   zGlibc_StrncpyBypass0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Glibc_Strncpy
+ */
+static const char* apzGlibc_StrncpyPatch[] = {
+    "format",
+    "#  define strncpy(dest, src, n) __builtin_strncpy (dest, src, n)",
+    "#  define strncpy([^\n\
+]*\\\\\n\
+)*[^\n\
+]*",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Glibc_Tgmath fix
+ */
+tSCC zGlibc_TgmathName[] =
+     "glibc_tgmath";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zGlibc_TgmathList[] =
+  "tgmath.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzGlibc_TgmathMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zGlibc_TgmathSelect0[] =
+       "\\(\\(\\(type\\) 0.25\\) && \\(\\(type\\) 0.25 - 1\\)\\)";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zGlibc_TgmathBypass0[] =
+       "__floating_type\\(type\\) \\\\\n\
+.*__builtin_classify_type";
+
+#define    GLIBC_TGMATH_TEST_CT  2
+static tTestDesc aGlibc_TgmathTests[] = {
+  { TT_NEGREP,   zGlibc_TgmathBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zGlibc_TgmathSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Glibc_Tgmath
+ */
+static const char* apzGlibc_TgmathPatch[] = {
+    "format",
+    "(__builtin_classify_type ((type) 0) == 8 || (__builtin_classify_type ((type) 0) == 9 && __builtin_classify_type (__real__ ((type) 0)) == 8))",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Gnu_Types fix
+ */
+tSCC zGnu_TypesName[] =
+     "gnu_types";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zGnu_TypesList[] =
+  "sys/types.h\0stdlib.h\0sys/stdtypes.h\0stddef.h\0memory.h\0unistd.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzGnu_TypesMachs[] = {
+        "*-*-solaris2.1[0-9]*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zGnu_TypesSelect0[] =
+       "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zGnu_TypesBypass0[] =
+       "_GCC_(PTRDIFF|SIZE|WCHAR)_T";
+
+#define    GNU_TYPES_TEST_CT  2
 static tTestDesc aGnu_TypesTests[] = {
   { TT_NEGREP,   zGnu_TypesBypass0, (regex_t*)NULL },
   { TT_EGREP,    zGnu_TypesSelect0, (regex_t*)NULL }, };
@@ -2586,6 +3194,51 @@ static const char* apzHp_SysfilePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Hppa_Hpux_Fp_Macros fix
+ */
+tSCC zHppa_Hpux_Fp_MacrosName[] =
+     "hppa_hpux_fp_macros";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHppa_Hpux_Fp_MacrosList[] =
+  "math.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHppa_Hpux_Fp_MacrosMachs[] = {
+        "hppa*-hp-hpux11*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHppa_Hpux_Fp_MacrosSelect0[] =
+       "#[ \t]*define[ \t]*FP_NORMAL.*\n\
+#[ \t]*define[ \t]*FP_ZERO.*\n\
+#[ \t]*define[ \t]*FP_INFINITE.*\n\
+#[ \t]*define[ \t]*FP_SUBNORMAL.*\n\
+#[ \t]*define[ \t]*FP_NAN.*\n";
+
+#define    HPPA_HPUX_FP_MACROS_TEST_CT  1
+static tTestDesc aHppa_Hpux_Fp_MacrosTests[] = {
+  { TT_EGREP,    zHppa_Hpux_Fp_MacrosSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hppa_Hpux_Fp_Macros
+ */
+static const char* apzHppa_Hpux_Fp_MacrosPatch[] = {
+    "format",
+    "#endif /* _INCLUDE_HPUX_SOURCE */\n\n\
+#if defined(_INCLUDE_HPUX_SOURCE) || \\\n\
+   (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))\n\
+%0#endif\n\n\
+#ifdef _INCLUDE_HPUX_SOURCE\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Hpux10_Cpp_Pow_Inline fix
  */
 tSCC zHpux10_Cpp_Pow_InlineName[] =
@@ -2665,50 +3318,6 @@ static const char* apzHpux11_Cpp_Pow_InlinePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hppa_Hpux_Fp_Macros fix
- */
-tSCC zHppa_Hpux_Fp_MacrosName[] =
-     "hppa_hpux_fp_macros";
-
-/*
- *  File name selection pattern
- */
-tSCC zHppa_Hpux_Fp_MacrosList[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHppa_Hpux_Fp_MacrosMachs[] = {
-        "hppa*-hp-hpux11*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHppa_Hpux_Fp_MacrosSelect0[] =
-       "#[ \t]*define[ \t]*FP_NORMAL.*\n\
-#[ \t]*define[ \t]*FP_ZERO.*\n\
-#[ \t]*define[ \t]*FP_INFINITE.*\n\
-#[ \t]*define[ \t]*FP_SUBNORMAL.*\n\
-#[ \t]*define[ \t]*FP_NAN.*\n";
-
-#define    HPPA_HPUX_FP_MACROS_TEST_CT  1
-static tTestDesc aHppa_Hpux_Fp_MacrosTests[] = {
-  { TT_EGREP,    zHppa_Hpux_Fp_MacrosSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hppa_Hpux_Fp_Macros
- */
-static const char* apzHppa_Hpux_Fp_MacrosPatch[] = {
-    "format",
-    "#endif /* _INCLUDE_HPUX_SOURCE */\n\n\
-#if defined(_INCLUDE_HPUX_SOURCE) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))\n\
-%0#endif\n\n\
-#ifdef _INCLUDE_HPUX_SOURCE\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Hpux10_Ctype_Declarations1 fix
  */
 tSCC zHpux10_Ctype_Declarations1Name[] =
@@ -2888,7 +3497,7 @@ tSCC zHpux11_AbsList[] =
  *  Machine/OS name selection pattern
  */
 tSCC* apzHpux11_AbsMachs[] = {
-        "ia64-hp-hpux11*",
+        "*-hp-hpux11*",
         (const char*)NULL };
 
 /*
@@ -2955,6 +3564,43 @@ static const char* apzHpux11_FabsfPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Hpux11_Pthread_Const fix
+ */
+tSCC zHpux11_Pthread_ConstName[] =
+     "hpux11_pthread_const";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_Pthread_ConstList[] =
+  "sys/pthread.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux11_Pthread_ConstMachs[] = {
+        "*-hp-hpux11.[0-3]*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_Pthread_ConstSelect0[] =
+       "^#define[ \t]*__POINTER_SET[ \t]*\\(\\(void \\*\\) 1LL\\)";
+
+#define    HPUX11_PTHREAD_CONST_TEST_CT  1
+static tTestDesc aHpux11_Pthread_ConstTests[] = {
+  { TT_EGREP,    zHpux11_Pthread_ConstSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Pthread_Const
+ */
+static const char* apzHpux11_Pthread_ConstPatch[] = {
+    "format",
+    "#define __POINTER_SET\t\t((void *) 1L)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Hpux11_Size_T fix
  */
 tSCC zHpux11_Size_TName[] =
@@ -3026,41 +3672,6 @@ static const char* apzHpux11_SnprintfPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux11_Uint32_C fix
- */
-tSCC zHpux11_Uint32_CName[] =
-     "hpux11_uint32_c";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux11_Uint32_CList[] =
-  "inttypes.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzHpux11_Uint32_CMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux11_Uint32_CSelect0[] =
-       "^#define UINT32_C\\(__c\\)[ \t]*__CONCAT__\\(__CONCAT_U__\\(__c\\),l\\)";
-
-#define    HPUX11_UINT32_C_TEST_CT  1
-static tTestDesc aHpux11_Uint32_CTests[] = {
-  { TT_EGREP,    zHpux11_Uint32_CSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux11_Uint32_C
- */
-static const char* apzHpux11_Uint32_CPatch[] = {
-    "format",
-    "#define UINT32_C(__c) __CONCAT__(__c,ul)",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Hpux11_Vsnprintf fix
  */
 tSCC zHpux11_VsnprintfName[] =
@@ -3131,7 +3742,7 @@ static tTestDesc aHpux8_Bogus_InlinesTests[] = {
 /*
  *  Fix Command Arguments for Hpux8_Bogus_Inlines
  */
-static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
+static const char* apzHpux8_Bogus_InlinesPatch[] = { sed_cmd_z,
     "-e", "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@",
     "-e", "s@inline double abs(double [a-z][a-z]*) {.*}@@",
     "-e", "s@inline int sqr(int [a-z][a-z]*) {.*}@@",
@@ -3194,7 +3805,7 @@ tSCC zHpux_HtonlList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zHpux_HtonlSelect0[] =
-       "#ifndef _XOPEN_SOURCE_EXTENDED\n\
+       "#ifndef _XOPEN_SOURCE_EXTENDED[ \t]*\n\
 (/\\*\n\
  \\* Macros for number representation conversion\\.\n\
  \\*/\n\
@@ -3228,7 +3839,10 @@ tSCC zHpux_Long_DoubleList[] =
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux_Long_DoubleMachs (const char**)NULL
+tSCC* apzHpux_Long_DoubleMachs[] = {
+        "*-*-hpux10*",
+        "*-*-hpux11.[012]*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
@@ -3250,13 +3864,50 @@ static tTestDesc aHpux_Long_DoubleTests[] = {
 /*
  *  Fix Command Arguments for Hpux_Long_Double
  */
-static const char* apzHpux_Long_DoublePatch[] = { "sed",
+static const char* apzHpux_Long_DoublePatch[] = { sed_cmd_z,
     "-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D",
     "-e", "s/long_double/long double/g",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Hpux_Long_Double_2 fix
+ */
+tSCC zHpux_Long_Double_2Name[] =
+     "hpux_long_double_2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux_Long_Double_2List[] =
+  "stdlib.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux_Long_Double_2Machs[] = {
+        "hppa*-*-hpux11.3*",
+        (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\\)";
+
+#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_Long_Double_2
+ */
+static const char* apzHpux_Long_Double_2Patch[] = {
+    "format",
+    "#  if !defined(_PROTOTYPES) || defined(_LONG_DOUBLE_STRUCT)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Hpux_Systime fix
  */
 tSCC zHpux_SystimeName[] =
@@ -3301,7 +3952,7 @@ tSCC zHpux_Spu_InfoName[] =
  *  File name selection pattern
  */
 tSCC zHpux_Spu_InfoList[] =
-  "ia64/sys/getppdp.h\0";
+  "ia64/sys/getppdp.h\0*/sys/getppdp.h\0";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3453,79 +4104,248 @@ extern \"C\" {\n\
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux11_Pthread_Const fix
+ *  Description of Hpux_Pthread_Initializers fix
  */
-tSCC zHpux11_Pthread_ConstName[] =
-     "hpux11_pthread_const";
+tSCC zHpux_Pthread_InitializersName[] =
+     "hpux_pthread_initializers";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux11_Pthread_ConstList[] =
+tSCC zHpux_Pthread_InitializersList[] =
   "sys/pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux11_Pthread_ConstMachs[] = {
+tSCC* apzHpux_Pthread_InitializersMachs[] = {
         "*-hp-hpux11.[0-3]*",
         (const char*)NULL };
+#define HPUX_PTHREAD_INITIALIZERS_TEST_CT  0
+#define aHpux_Pthread_InitializersTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Hpux_Pthread_Initializers
+ */
+static const char* apzHpux_Pthread_InitializersPatch[] = { sed_cmd_z,
+    "-e", "s@^[ \t]*1, 1, 1, 1,[ \t]*\\\\@\t{ 1, 1, 1, 1 },\t\t\t\t\t\t\t\\\\@",
+    "-e", "s@^[ \t]*1,[ \t]*\\\\@\t{ 1, 0 }@",
+    "-e", "/^[ \t]*0$/d",
+    "-e", "s@__PTHREAD_MUTEX_VALID, 0@{ __PTHREAD_MUTEX_VALID, 0 }@",
+    "-e", "s@^[ \t]*0, 0, -1, 0,[ \t]*\\\\@\t{ 0, 0, -1, 0 },\t\t\t\t\t\t\\\\@",
+    "-e", "s@0, __LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\@{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@",
+    "-e", "s@^[ \t]*__LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\@\t{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@",
+    "-e", "s@^[ \t]*0, 0[ \t]*\\\\@\t{ 0, 0 }\t\t\t\t\t\t\t\\\\@",
+    "-e", "s@__PTHREAD_COND_VALID, 0@{ __PTHREAD_COND_VALID, 0 }@",
+    "-e", "s@__LWP_COND_VALID, 0,[ \t]*\\\\@{ __LWP_COND_VALID, 0 },\t\t\t\t\t\\\\@",
+    "-e", "s@__PTHREAD_RWLOCK_VALID, 0@{ __PTHREAD_RWLOCK_VALID, 0 }@",
+    "-e", "s@__LWP_RWLOCK_VALID, 0,[ \t]*\\\\@{ __LWP_RWLOCK_VALID, 0 },\t\t\t\t\t\\\\@",
+    "-e", "s@^[ \t]*0, 0, 0, 0, 0, 0, 0[ \t]*\\\\@\t{ 0, 0, 0, 0, 0 }, { 0, 0}\t\t\t\t\t\\\\@",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of 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
+ */
+tSCC zHpux_C99_InttypesName[] =
+     "hpux_c99_inttypes";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux_C99_InttypesList[] =
+  "inttypes.h\0stdint-hpux11.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux_C99_InttypesMachs[] = {
+        "*-hp-hpux11.[23]*",
+        (const char*)NULL };
+#define HPUX_C99_INTTYPES_TEST_CT  0
+#define aHpux_C99_InttypesTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for 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
+ */
+tSCC zHpux_C99_Inttypes2Name[] =
+     "hpux_c99_inttypes2";
+
+/*
+ *  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
+
+/*
+ *  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_Stdint_Least_Fast fix
+ */
+tSCC zHpux_Stdint_Least_FastName[] =
+     "hpux_stdint_least_fast";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux_Stdint_Least_FastList[] =
+  "stdint-hpux11.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux_Stdint_Least_FastMachs[] = {
+        "*-hp-hpux11.2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux11_Pthread_ConstSelect0[] =
-       "^#define[ \t]*__POINTER_SET[ \t]*\\(\\(void \\*\\) 1LL\\)";
+tSCC zHpux_Stdint_Least_FastSelect0[] =
+       "^[ \t]*#[ \t]*define[ \t]+UINT_(LEAST|FAST)64_MAX[ \t]+ULLONG_MAX";
 
-#define    HPUX11_PTHREAD_CONST_TEST_CT  1
-static tTestDesc aHpux11_Pthread_ConstTests[] = {
-  { TT_EGREP,    zHpux11_Pthread_ConstSelect0, (regex_t*)NULL }, };
+#define    HPUX_STDINT_LEAST_FAST_TEST_CT  1
+static tTestDesc aHpux_Stdint_Least_FastTests[] = {
+  { TT_EGREP,    zHpux_Stdint_Least_FastSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux11_Pthread_Const
+ *  Fix Command Arguments for Hpux_Stdint_Least_Fast
  */
-static const char* apzHpux11_Pthread_ConstPatch[] = {
+static const char* apzHpux_Stdint_Least_FastPatch[] = {
     "format",
-    "#define __POINTER_SET\t\t((void *) 1L)",
+    "#  define\tUINT_%164_MAX\t__UINT64_MAX__",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Pthread_Initializers fix
+ *  Description of Hpux_Inttype_Int8_T fix
  */
-tSCC zHpux_Pthread_InitializersName[] =
-     "hpux_pthread_initializers";
+tSCC zHpux_Inttype_Int8_TName[] =
+     "hpux_inttype_int8_t";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_Pthread_InitializersList[] =
-  "sys/pthread.h\0";
+tSCC zHpux_Inttype_Int8_TList[] =
+  "sys/_inttypes.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_Pthread_InitializersMachs[] = {
-        "*-hp-hpux11.[0-3]*",
+tSCC* apzHpux_Inttype_Int8_TMachs[] = {
+        "*-hp-hpux1[01].*",
         (const char*)NULL };
-#define HPUX_PTHREAD_INITIALIZERS_TEST_CT  0
-#define aHpux_Pthread_InitializersTests   (tTestDesc*)NULL
 
 /*
- *  Fix Command Arguments for Hpux_Pthread_Initializers
+ *  content selection pattern - do fix if pattern found
  */
-static const char* apzHpux_Pthread_InitializersPatch[] = { "sed",
-    "-e", "s@^[ \t]*1, 1, 1, 1,[ \t]*\\\\@\t{ 1, 1, 1, 1 },\t\t\t\t\t\t\t\\\\@",
-    "-e", "s@^[ \t]*1,[ \t]*\\\\@\t{ 1, 0 }@",
-    "-e", "/^[ \t]*0$/d",
-    "-e", "s@__PTHREAD_MUTEX_VALID, 0@{ __PTHREAD_MUTEX_VALID, 0 }@",
-    "-e", "s@^[ \t]*0, 0, -1, 0,[ \t]*\\\\@\t{ 0, 0, -1, 0 },\t\t\t\t\t\t\\\\@",
-    "-e", "s@0, __LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\@{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@",
-    "-e", "s@^[ \t]*__LWP_MTX_VALID, 0, 1, 1, 1, 1,[ \t]*\\\\@\t{ 0, __LWP_MTX_VALID }, { 0, 1, 1, 1, 1 },\t\t\t\\\\@",
-    "-e", "s@^[ \t]*0, 0[ \t]*\\\\@\t{ 0, 0 }\t\t\t\t\t\t\t\\\\@",
-    "-e", "s@__PTHREAD_COND_VALID, 0@{ __PTHREAD_COND_VALID, 0 }@",
-    "-e", "s@__LWP_COND_VALID, 0,[ \t]*\\\\@{ __LWP_COND_VALID, 0 },\t\t\t\t\t\\\\@",
-    "-e", "s@__PTHREAD_RWLOCK_VALID, 0@{ __PTHREAD_RWLOCK_VALID, 0 }@",
-    "-e", "s@__LWP_RWLOCK_VALID, 0,[ \t]*\\\\@{ __LWP_RWLOCK_VALID, 0 },\t\t\t\t\t\\\\@",
-    "-e", "s@^[ \t]*0, 0, 0, 0, 0, 0, 0[ \t]*\\\\@\t{ 0, 0, 0, 0, 0 }, { 0, 0}\t\t\t\t\t\\\\@",
+tSCC zHpux_Inttype_Int8_TSelect0[] =
+       "^[ \t]*typedef[ \t]*char[ \t]*int(_least){0,1}8_t.*";
+
+#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 Hpux_Inttype_Int8_T
+ */
+static const char* apzHpux_Inttype_Int8_TPatch[] = {
+    "format",
+    "typedef signed char int%18_t;",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux_Imaginary_I fix
+ */
+tSCC zHpux_Imaginary_IName[] =
+     "hpux_imaginary_i";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux_Imaginary_IList[] =
+  "complex.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux_Imaginary_IMachs[] = {
+        "ia64-hp-hpux11.*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_Imaginary_ISelect0[] =
+       "^[ \t]*#[ \t]*define[ \t]*_Complex_I.*";
+
+#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_Imaginary_I
+ */
+static const char* apzHpux_Imaginary_IPatch[] = {
+    "format",
+    "#define _Complex_I (__extension__ 1.0iF)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3794,7 +4614,7 @@ static tTestDesc aIp_Missing_SemiTests[] = {
 /*
  *  Fix Command Arguments for Ip_Missing_Semi
  */
-static const char* apzIp_Missing_SemiPatch[] = { "sed",
+static const char* apzIp_Missing_SemiPatch[] = { sed_cmd_z,
     "-e", "/^struct/,/^};/s/}$/};/",
     (char*)NULL };
 
@@ -3958,6 +4778,45 @@ static const char* apzIrix_Asm_ApostrophePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Irix_Complex fix
+ */
+tSCC zIrix_ComplexName[] =
+     "irix_complex";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_ComplexList[] =
+  "complex.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzIrix_ComplexMachs[] = {
+        "mips-sgi-irix6.5",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_ComplexSelect0[] =
+       "#define[ \t]_Complex_I[ \t]\\(\\(float[ \t]_Complex\\)[ \t]\\(__I__\\)\\)";
+
+#define    IRIX_COMPLEX_TEST_CT  1
+static tTestDesc aIrix_ComplexTests[] = {
+  { TT_EGREP,    zIrix_ComplexSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Irix_Complex
+ */
+static const char* apzIrix_ComplexPatch[] = { sed_cmd_z,
+    "-e", "s/#define[ \t]_Complex_I[ \t]((float[ \t]_Complex)[ \t](__I__))/#define _Complex_I (__extension__ 1.0iF)/",
+    "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d",
+    "-e", "/#define[ \t]_Imaginary_I/d",
+    "-e", "s/#define[ \t]I[ \t]_Imaginary_I/#define I _Complex_I/",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Irix_Limits_Const fix
  */
 tSCC zIrix_Limits_ConstName[] =
@@ -3993,6 +4852,43 @@ static const char* apzIrix_Limits_ConstPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Irix_Pthread_Init fix
+ */
+tSCC zIrix_Pthread_InitName[] =
+     "irix_pthread_init";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_Pthread_InitList[] =
+  "pthread.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzIrix_Pthread_InitMachs[] = {
+        "mips-sgi-irix6.5",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_Pthread_InitSelect0[] =
+       "^(#define[ \t]+PTHREAD_.*_INITIALIZER[ \t]+)(\\{ 0 \\})";
+
+#define    IRIX_PTHREAD_INIT_TEST_CT  1
+static tTestDesc aIrix_Pthread_InitTests[] = {
+  { TT_EGREP,    zIrix_Pthread_InitSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Irix_Pthread_Init
+ */
+static const char* apzIrix_Pthread_InitPatch[] = {
+    "format",
+    "%1{ %2 }",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Irix_Socklen_T fix
  */
 tSCC zIrix_Socklen_TName[] =
@@ -4035,38 +4931,38 @@ typedef int socklen_t;\n\
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Stdint_C99 fix
+ *  Description of Irix_Stdint_C99_Mode fix
  */
-tSCC zIrix_Stdint_C99Name[] =
-     "irix_stdint_c99";
+tSCC zIrix_Stdint_C99_ModeName[] =
+     "irix_stdint_c99_mode";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Stdint_C99List[] =
+tSCC zIrix_Stdint_C99_ModeList[] =
   "stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzIrix_Stdint_C99Machs[] = {
+tSCC* apzIrix_Stdint_C99_ModeMachs[] = {
         "mips-sgi-irix6.5",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Stdint_C99Select0[] =
+tSCC zIrix_Stdint_C99_ModeSelect0[] =
        "(#ifndef __c99\n\
 )(#error This header file is to be used only for c99 mode compilations)";
 
-#define    IRIX_STDINT_C99_TEST_CT  1
-static tTestDesc aIrix_Stdint_C99Tests[] = {
-  { TT_EGREP,    zIrix_Stdint_C99Select0, (regex_t*)NULL }, };
+#define    IRIX_STDINT_C99_MODE_TEST_CT  1
+static tTestDesc aIrix_Stdint_C99_ModeTests[] = {
+  { TT_EGREP,    zIrix_Stdint_C99_ModeSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Stdint_C99
+ *  Fix Command Arguments for Irix_Stdint_C99_Mode
  */
-static const char* apzIrix_Stdint_C99Patch[] = {
+static const char* apzIrix_Stdint_C99_ModePatch[] = {
     "format",
     "#if 0\n\
 %2",
@@ -4074,6 +4970,83 @@ static const char* apzIrix_Stdint_C99Patch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Irix_Stdint_C99_Types fix
+ */
+tSCC zIrix_Stdint_C99_TypesName[] =
+     "irix_stdint_c99_types";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_Stdint_C99_TypesList[] =
+  "stdint-irix65.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
+
+/*
+ *  Fix Command Arguments for Irix_Stdint_C99_Types
+ */
+static const char* apzIrix_Stdint_C99_TypesPatch[] = { sed_cmd_z,
+    "-e", "s@^#define INT64_MIN.*(-0x7fffffffffffffff - 1)$@#define INT64_MIN               (-0x7fffffffffffffffLL - 1)@",
+    "-e", "s@^#define INT64_MAX.*0x7fffffffffffffff$@#define INT64_MAX               0x7fffffffffffffffLL@",
+    "-e", "s@^#define UINT32_MAX.*0xffffffff$@#define UINT32_MAX              0xffffffffU@",
+    "-e", "s@^#define UINT64_MAX.*0xffffffffffffffff$@#define UINT64_MAX              0xffffffffffffffffULL@",
+    "-e", "s@^#define INTPTR_MIN.*INT32_MIN$@#define INTPTR_MIN              (-0x7fffffffL - 1)@",
+    "-e", "s@^#define INTPTR_MAX.*INT32_MAX$@#define INTPTR_MAX              0x7fffffffL@",
+    "-e", "s@^#define UINTPTR_MAX.*UINT32_MAX$@#define UINTPTR_MAX             0xffffffffUL@",
+    "-e", "s@^#define INTPTR_MIN.*INT64_MIN@#define INTPTR_MIN              (-0x7fffffffffffffffL - 1)@",
+    "-e", "s@^#define INTPTR_MAX.*INT64_MAX$@#define INTPTR_MAX              0x7fffffffffffffffL@",
+    "-e", "s@^#define UINTPTR_MAX.*UINT64_MAX$@#define UINTPTR_MAX             0xffffffffffffffffUL@",
+    "-e", "s@^#define PTRDIFF_MIN.*INT64_MIN$@#define PTRDIFF_MIN             (-0x7fffffffffffffffL - 1)@",
+    "-e", "s@^#define PTRDIFF_MAX.*INT64_MAX$@#define PTRDIFF_MAX             0x7fffffffffffffffL@",
+    "-e", "s@^#define SIZE_MAX.*UINT64_MAX$@#define SIZE_MAX                0xffffffffffffffffUL@",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Irix_Stdint_C99_Macros fix
+ */
+tSCC zIrix_Stdint_C99_MacrosName[] =
+     "irix_stdint_c99_macros";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_Stdint_C99_MacrosList[] =
+  "stdint-irix65.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzIrix_Stdint_C99_MacrosMachs[] = {
+        "mips-sgi-irix6.5",
+        (const char*)NULL };
+#define IRIX_STDINT_C99_MACROS_TEST_CT  0
+#define aIrix_Stdint_C99_MacrosTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Irix_Stdint_C99_Macros
+ */
+static const char* apzIrix_Stdint_C99_MacrosPatch[] = { sed_cmd_z,
+    "-e", "s@^#define INT8_C(x).*int.*_t.*$@#define INT8_C(x)               (x)@",
+    "-e", "s@^#define INT16_C(x).*int.*_t.*$@#define INT16_C(x)              (x)@",
+    "-e", "s@^#define INT32_C(x).*int.*_t.*$@#define INT32_C(x)              (x)@",
+    "-e", "s@^#define INT64_C(x).*int.*_t.*$@#define INT64_C(x)              (x ## LL)@",
+    "-e", "s@^#define UINT8_C(x).*int.*_t.*$@#define UINT8_C(x)              (x)@",
+    "-e", "s@^#define UINT16_C(x).*int.*_t.*$@#define UINT16_C(x)             (x)@",
+    "-e", "s@^#define UINT32_C(x).*int.*_t.*$@#define UINT32_C(x)             (x ## U)@",
+    "-e", "s@^#define UINT64_C(x).*int.*_t.*$@#define UINT64_C(x)             (x ## ULL)@",
+    "-e", "s@^#define INTMAX_C(x).*int.*_t.*$@#define INTMAX_C(x)             (x ## LL)@",
+    "-e", "s@^#define UINTMAX_C(x).*int.*_t.*$@#define UINTMAX_C(x)            (x ## ULL)@",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Irix_Stdio_Va_List fix
  */
 tSCC zIrix_Stdio_Va_ListName[] =
@@ -4148,234 +5121,79 @@ static const char* apzIrix_WcsftimePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Isc_Fmod fix
+ *  Description of Kandr_Concat fix
  */
-tSCC zIsc_FmodName[] =
-     "isc_fmod";
+tSCC zKandr_ConcatName[] =
+     "kandr_concat";
 
 /*
  *  File name selection pattern
  */
-tSCC zIsc_FmodList[] =
-  "math.h\0";
+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 apzIsc_FmodMachs (const char**)NULL
+#define apzKandr_ConcatMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIsc_FmodSelect0[] =
-       "fmod\\(double\\)";
+tSCC zKandr_ConcatSelect0[] =
+       "/\\*\\*/";
 
-#define    ISC_FMOD_TEST_CT  1
-static tTestDesc aIsc_FmodTests[] = {
-  { TT_EGREP,    zIsc_FmodSelect0, (regex_t*)NULL }, };
+#define    KANDR_CONCAT_TEST_CT  1
+static tTestDesc aKandr_ConcatTests[] = {
+  { TT_EGREP,    zKandr_ConcatSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Isc_Fmod
+ *  Fix Command Arguments for Kandr_Concat
  */
-static const char* apzIsc_FmodPatch[] = {
+static const char* apzKandr_ConcatPatch[] = {
     "format",
-    "fmod(double, double)",
+    "##",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Isc_Omits_With_Stdc fix
+ *  Description of Linux_Ia64_Ucontext fix
  */
-tSCC zIsc_Omits_With_StdcName[] =
-     "isc_omits_with_stdc";
+tSCC zLinux_Ia64_UcontextName[] =
+     "linux_ia64_ucontext";
 
 /*
  *  File name selection pattern
  */
-tSCC zIsc_Omits_With_StdcList[] =
-  "stdio.h\0math.h\0ctype.h\0sys/limits.h\0sys/fcntl.h\0sys/dirent.h\0";
+tSCC zLinux_Ia64_UcontextList[] =
+  "sys/ucontext.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzIsc_Omits_With_StdcMachs (const char**)NULL
+tSCC* apzLinux_Ia64_UcontextMachs[] = {
+        "ia64-*-linux*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIsc_Omits_With_StdcSelect0[] =
-       "!defined\\(__STDC__\\) && !defined\\(_POSIX_SOURCE\\)";
+tSCC zLinux_Ia64_UcontextSelect0[] =
+       "\\(\\(\\(char \\*\\) &\\(\\(struct sigcontext \\*\\) 0\\)->sc_gr\\[0\\]\\) - \\(char \\*\\) 0\\)";
 
-#define    ISC_OMITS_WITH_STDC_TEST_CT  1
-static tTestDesc aIsc_Omits_With_StdcTests[] = {
-  { TT_EGREP,    zIsc_Omits_With_StdcSelect0, (regex_t*)NULL }, };
+#define    LINUX_IA64_UCONTEXT_TEST_CT  1
+static tTestDesc aLinux_Ia64_UcontextTests[] = {
+  { TT_EGREP,    zLinux_Ia64_UcontextSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Isc_Omits_With_Stdc
+ *  Fix Command Arguments for Linux_Ia64_Ucontext
  */
-static const char* apzIsc_Omits_With_StdcPatch[] = {
+static const char* apzLinux_Ia64_UcontextPatch[] = {
     "format",
-    "!defined(_POSIX_SOURCE)",
+    "__builtin_offsetof (struct sigcontext, sc_gr[0])",
     (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 Libc1_G_Va_List fix
- */
-tSCC zLibc1_G_Va_ListName[] =
-     "libc1_G_va_list";
-
-/*
- *  File name selection pattern
- */
-tSCC zLibc1_G_Va_ListList[] =
-  "_G_config.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzLibc1_G_Va_ListMachs[] = {
-        "*-*-linux*libc1",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zLibc1_G_Va_ListSelect0[] =
-       "typedef void \\* _G_va_list;";
-
-#define    LIBC1_G_VA_LIST_TEST_CT  1
-static tTestDesc aLibc1_G_Va_ListTests[] = {
-  { TT_EGREP,    zLibc1_G_Va_ListSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Libc1_G_Va_List
- */
-static const char* apzLibc1_G_Va_ListPatch[] = {
-    "format",
-    "typedef __builtin_va_list _G_va_list;",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Libc1_Ifdefd_Memx fix
- */
-tSCC zLibc1_Ifdefd_MemxName[] =
-     "libc1_ifdefd_memx";
-
-/*
- *  File name selection pattern
- */
-tSCC zLibc1_Ifdefd_MemxList[] =
-  "testing.h\0string.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzLibc1_Ifdefd_MemxMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zLibc1_Ifdefd_MemxSelect0[] =
-       "' is a built-in function for gcc 2\\.x\\. \\*/";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zLibc1_Ifdefd_MemxBypass0[] =
-       "__cplusplus";
-
-#define    LIBC1_IFDEFD_MEMX_TEST_CT  2
-static tTestDesc aLibc1_Ifdefd_MemxTests[] = {
-  { TT_NEGREP,   zLibc1_Ifdefd_MemxBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zLibc1_Ifdefd_MemxSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Libc1_Ifdefd_Memx
- */
-static const char* apzLibc1_Ifdefd_MemxPatch[] = {
-    "format",
-    "%1",
-    "/\\* `mem...' is a built-in function for gcc 2\\.x\\. \\*/\n\
-#if defined\\(__STDC__\\) && __GNUC__ < 2\n\
-(/\\* .* \\*/\n\
-extern [a-z_]+ mem.*(\n\
-[^#].*)*;)\n\
-#endif",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Linux_Ia64_Ucontext fix
- */
-tSCC zLinux_Ia64_UcontextName[] =
-     "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
+ *  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";
@@ -4657,78 +5475,6 @@ static const char* apzNested_Auth_DesPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Nested_Motorola fix
- */
-tSCC zNested_MotorolaName[] =
-     "nested_motorola";
-
-/*
- *  File name selection pattern
- */
-tSCC zNested_MotorolaList[] =
-  "sys/limits.h\0limits.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzNested_MotorolaMachs[] = {
-        "m68k-motorola-sysv*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zNested_MotorolaSelect0[] =
-       "max # bytes atomic in write|error value returned by Math lib";
-
-#define    NESTED_MOTOROLA_TEST_CT  1
-static tTestDesc aNested_MotorolaTests[] = {
-  { TT_EGREP,    zNested_MotorolaSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Nested_Motorola
- */
-static const char* apzNested_MotorolaPatch[] = { "sed",
-    "-e", "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*/\\* max # bytes atomic in write to a\\)$@\\1 */@",
-    "-e", "s@\\(/\\*#define\tHUGE_VAL\t3.[0-9e+]* \\)\\(/\\*error value returned by Math lib\\*/\\)$@\\1*/ \\2@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Nested_Sys_Limits fix
- */
-tSCC zNested_Sys_LimitsName[] =
-     "nested_sys_limits";
-
-/*
- *  File name selection pattern
- */
-tSCC zNested_Sys_LimitsList[] =
-  "sys/limits.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzNested_Sys_LimitsMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zNested_Sys_LimitsSelect0[] =
-       "CHILD_MAX";
-
-#define    NESTED_SYS_LIMITS_TEST_CT  1
-static tTestDesc aNested_Sys_LimitsTests[] = {
-  { TT_EGREP,    zNested_Sys_LimitsSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Nested_Sys_Limits
- */
-static const char* apzNested_Sys_LimitsPatch[] = { "sed",
-    "-e", "/CHILD_MAX/s,/\\* Max, Max,",
-    "-e", "/OPEN_MAX/s,/\\* Max, Max,",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Netbsd_C99_Inline_1 fix
  */
 tSCC zNetbsd_C99_Inline_1Name[] =
@@ -4848,6 +5594,96 @@ static const char* apzNetbsd_Extra_SemicolonPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Newlib_Stdint_1 fix
+ */
+tSCC zNewlib_Stdint_1Name[] =
+     "newlib_stdint_1";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zNewlib_Stdint_1List[] =
+  "stdint-newlib.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzNewlib_Stdint_1Machs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zNewlib_Stdint_1Select0[] =
+       "@todo - Add support for wint_t types";
+
+#define    NEWLIB_STDINT_1_TEST_CT  1
+static tTestDesc aNewlib_Stdint_1Tests[] = {
+  { TT_EGREP,    zNewlib_Stdint_1Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Newlib_Stdint_1
+ */
+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 Newlib_Stdint_2 fix
+ */
+tSCC zNewlib_Stdint_2Name[] =
+     "newlib_stdint_2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zNewlib_Stdint_2List[] =
+  "stdint-newlib.h\0stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#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 Newlib_Stdint_2
+ */
+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 Next_Math_Prefix fix
  */
 tSCC zNext_Math_PrefixName[] =
@@ -5026,6 +5862,60 @@ static const char* apzNodeent_SyntaxPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Openbsd_Null_Definition fix
+ */
+tSCC zOpenbsd_Null_DefinitionName[] =
+     "openbsd_null_definition";
+
+/*
+ *  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";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzOpenbsd_Null_DefinitionMachs[] = {
+        "*-*-openbsd*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zOpenbsd_Null_DefinitionSelect0[] =
+       "__GNUG__";
+
+#define    OPENBSD_NULL_DEFINITION_TEST_CT  1
+static tTestDesc aOpenbsd_Null_DefinitionTests[] = {
+  { TT_EGREP,    zOpenbsd_Null_DefinitionSelect0, (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",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Obstack_Lvalue_Cast fix
  */
 tSCC zObstack_Lvalue_CastName[] =
@@ -5061,6 +5951,43 @@ static const char* apzObstack_Lvalue_CastPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Openbsd_Va_Start fix
+ */
+tSCC zOpenbsd_Va_StartName[] =
+     "openbsd_va_start";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zOpenbsd_Va_StartList[] =
+  "stdarg.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzOpenbsd_Va_StartMachs[] = {
+        "*-*-openbsd*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zOpenbsd_Va_StartSelect0[] =
+       "__builtin_stdarg_start";
+
+#define    OPENBSD_VA_START_TEST_CT  1
+static tTestDesc aOpenbsd_Va_StartTests[] = {
+  { TT_EGREP,    zOpenbsd_Va_StartSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Openbsd_Va_Start
+ */
+static const char* apzOpenbsd_Va_StartPatch[] = {
+    "format",
+    "__builtin_va_start",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Osf_Namespace_A fix
  */
 tSCC zOsf_Namespace_AName[] =
@@ -5160,61 +6087,26 @@ typedef __regmatch_t\tregmatch_t;",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Pthread_Page_Size fix
+ *  Description of Pthread_Incomplete_Struct_Argument fix
  */
-tSCC zPthread_Page_SizeName[] =
-     "pthread_page_size";
+tSCC zPthread_Incomplete_Struct_ArgumentName[] =
+     "pthread_incomplete_struct_argument";
 
 /*
  *  File name selection pattern
  */
-tSCC zPthread_Page_SizeList[] =
+tSCC zPthread_Incomplete_Struct_ArgumentList[] =
   "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzPthread_Page_SizeMachs (const char**)NULL
+#define apzPthread_Incomplete_Struct_ArgumentMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zPthread_Page_SizeSelect0[] =
-       "^int __page_size";
-
-#define    PTHREAD_PAGE_SIZE_TEST_CT  1
-static tTestDesc aPthread_Page_SizeTests[] = {
-  { TT_EGREP,    zPthread_Page_SizeSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Pthread_Page_Size
- */
-static const char* apzPthread_Page_SizePatch[] = {
-    "format",
-    "extern %0",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Pthread_Incomplete_Struct_Argument fix
- */
-tSCC zPthread_Incomplete_Struct_ArgumentName[] =
-     "pthread_incomplete_struct_argument";
-
-/*
- *  File name selection pattern
- */
-tSCC zPthread_Incomplete_Struct_ArgumentList[] =
-  "pthread.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzPthread_Incomplete_Struct_ArgumentMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zPthread_Incomplete_Struct_ArgumentSelect0[] =
-       "struct __jmp_buf_tag";
+tSCC zPthread_Incomplete_Struct_ArgumentSelect0[] =
+       "struct __jmp_buf_tag";
 
 #define    PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT  1
 static tTestDesc aPthread_Incomplete_Struct_ArgumentTests[] = {
@@ -5448,173 +6340,276 @@ static const char* apzRs6000_ParamPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sco_Math fix
+ *  Description of Solaris___Restrict fix
  */
-tSCC zSco_MathName[] =
-     "sco_math";
+tSCC zSolaris___RestrictName[] =
+     "solaris___restrict";
 
 /*
  *  File name selection pattern
  */
-tSCC zSco_MathList[] =
-  "math.h\0*/math.h\0";
+tSCC zSolaris___RestrictList[] =
+  "sys/feature_tests.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSco_MathMachs (const char**)NULL
+tSCC* apzSolaris___RestrictMachs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSco_MathSelect0[] =
-       "inline double abs";
+tSCC zSolaris___RestrictSelect0[] =
+       "#define[ \t]*_RESTRICT_KYWD[ \t]*restrict";
+
+#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
+ *  Fix Command Arguments for Solaris___Restrict
  */
-tSCC zSco_MathBypass0[] =
-       "__GNUG__";
+static const char* apzSolaris___RestrictPatch[] = {
+    "format",
+    "#ifdef __cplusplus\n\
+#define\t_RESTRICT_KYWD\t__restrict\n\
+#else\n\
+%0\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Solaris_Complex fix
+ */
+tSCC zSolaris_ComplexName[] =
+     "solaris_complex";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSolaris_ComplexList[] =
+  "complex.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_ComplexMachs[] = {
+        "*-*-solaris2.*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_ComplexSelect0[] =
+       "#define[ \t]_Complex_I[ \t]_Complex_I";
+
+#define    SOLARIS_COMPLEX_TEST_CT  1
+static tTestDesc aSolaris_ComplexTests[] = {
+  { TT_EGREP,    zSolaris_ComplexSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Solaris_Complex
+ */
+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 Solaris_Complex_Cxx fix
+ */
+tSCC zSolaris_Complex_CxxName[] =
+     "solaris_complex_cxx";
 
-#define    SCO_MATH_TEST_CT  2
-static tTestDesc aSco_MathTests[] = {
-  { TT_NEGREP,   zSco_MathBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSco_MathSelect0, (regex_t*)NULL }, };
+/*
+ *  File name selection pattern
+ */
+tSCC zSolaris_Complex_CxxList[] =
+  "complex.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+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 Sco_Math
+ *  Fix Command Arguments for Solaris_Complex_Cxx
  */
-static const char* apzSco_MathPatch[] = { "sed",
-    "-e", "/#define.*__fp_class(a) \\\\/i\\\n\
-#ifndef __GNUC__\n",
-    "-e", "/.*__builtin_generic/a\\\n\
-#else\\\n\
-#define __fp_class(a) \\\\\\\n\
-  __builtin_choose_expr(__builtin_types_compatible_p(typeof(a),long double),\\\\\\\n\
-   __fpclassifyl(a), \\\\\\\n\
-    __builtin_choose_expr(__builtin_types_compatible_p(typeof(a), float), \\\\\\\n\
-      __fpclassifyf(a),__fpclassify(a)))\\\n\
+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",
-    "-e", "/extern \"C\\+\\+\"/N;/inline double abs/i\\\n\
-#ifndef __GNUC__\n",
-    "-e", "/inline long double trunc/N;/inline long double trunc.*}.*extern \"C\\+\\+\"/a\\\n\
-#endif /* ! __GNUC__ */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sco_Regset fix
+ *  Description of Solaris_Cond_Init fix
  */
-tSCC zSco_RegsetName[] =
-     "sco_regset";
+tSCC zSolaris_Cond_InitName[] =
+     "solaris_cond_init";
 
 /*
  *  File name selection pattern
  */
-tSCC zSco_RegsetList[] =
-  "sys/regset.h\0";
+tSCC zSolaris_Cond_InitList[] =
+  "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSco_RegsetMachs[] = {
-        "*-*-sco3.2v5*",
+tSCC* apzSolaris_Cond_InitMachs[] = {
+        "*-*-solaris2.8",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSco_RegsetSelect0[] =
-       "(struct[ \t]+.*)fpstate";
+tSCC zSolaris_Cond_InitSelect0[] =
+       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    SCO_REGSET_TEST_CT  1
-static tTestDesc aSco_RegsetTests[] = {
-  { TT_EGREP,    zSco_RegsetSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_COND_INIT_TEST_CT  1
+static tTestDesc aSolaris_Cond_InitTests[] = {
+  { TT_EGREP,    zSolaris_Cond_InitSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sco_Regset
+ *  Fix Command Arguments for Solaris_Cond_Init
  */
-static const char* apzSco_RegsetPatch[] = {
+static const char* apzSolaris_Cond_InitPatch[] = {
     "format",
-    "%1rsfpstate",
+    "%1, 0x4356%2",
+    "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+\\{.*0)(\\},[ \t]*0\\}.*)$",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sco_Static_Func fix
+ *  Description of Solaris_Cxx_Linkage fix
  */
-tSCC zSco_Static_FuncName[] =
-     "sco_static_func";
+tSCC zSolaris_Cxx_LinkageName[] =
+     "solaris_cxx_linkage";
 
 /*
  *  File name selection pattern
  */
-tSCC zSco_Static_FuncList[] =
-  "sys/stat.h\0";
+tSCC zSolaris_Cxx_LinkageList[] =
+  "iso/stdlib_iso.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSco_Static_FuncMachs[] = {
-        "i?86-*-sco3.2*",
+tSCC* apzSolaris_Cxx_LinkageMachs[] = {
+        "*-*-solaris2*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSco_Static_FuncSelect0[] =
-       "^static int";
+tSCC zSolaris_Cxx_LinkageSelect0[] =
+       "(#if __cplusplus >= 199711L)\n\
+(extern \"C\\+\\+\" \\{\n\
+)(.*(bsearch|qsort).*)";
 
-#define    SCO_STATIC_FUNC_TEST_CT  1
-static tTestDesc aSco_Static_FuncTests[] = {
-  { TT_EGREP,    zSco_Static_FuncSelect0, (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 Sco_Static_Func
+ *  Fix Command Arguments for Solaris_Cxx_Linkage
  */
-static const char* apzSco_Static_FuncPatch[] = { "sed",
-    "-e", "/^static int/i\\\n\
-#if __cplusplus\\\n\
-extern \"C\" {\\\n\
-#endif /* __cplusplus */",
-    "-e", "/^}$/a\\\n\
-#if __cplusplus\\\n\
- }\\\n\
-#endif /* __cplusplus */",
+static const char* apzSolaris_Cxx_LinkagePatch[] = {
+    "format",
+    "%1 && !__GNUG__\n\
+%2%3",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Solaris_Getc_Strict_Stdc fix
+ */
+tSCC zSolaris_Getc_Strict_StdcName[] =
+     "solaris_getc_strict_stdc";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSolaris_Getc_Strict_StdcList[] =
+  "iso/stdio_iso.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Getc_Strict_StdcMachs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Getc_Strict_StdcSelect0[] =
+       "(.*&& )!defined\\(_STRICT_STDC\\)(.*)";
+
+#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 Solaris_Getc_Strict_Stdc
+ */
+static const char* apzSolaris_Getc_Strict_StdcPatch[] = {
+    "format",
+    "%1(!defined(_STRICT_STDC) || (__cplusplus >= 199711L))%2",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sco_Utime fix
+ *  Description of Solaris_Longjmp_Noreturn fix
  */
-tSCC zSco_UtimeName[] =
-     "sco_utime";
+tSCC zSolaris_Longjmp_NoreturnName[] =
+     "solaris_longjmp_noreturn";
 
 /*
  *  File name selection pattern
  */
-tSCC zSco_UtimeList[] =
-  "sys/times.h\0";
+tSCC zSolaris_Longjmp_NoreturnList[] =
+  "iso/setjmp_iso.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSco_UtimeMachs[] = {
-        "i?86-*-sco3.2v4*",
+tSCC* apzSolaris_Longjmp_NoreturnMachs[] = {
+        "*-*-solaris2*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSco_UtimeSelect0[] =
-       "\\(const char \\*, struct utimbuf \\*\\);";
+tSCC zSolaris_Longjmp_NoreturnSelect0[] =
+       "(.*longjmp\\(jmp_buf.*[^)]+\\));";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Longjmp_NoreturnBypass0[] =
+       "__NORETURN";
 
-#define    SCO_UTIME_TEST_CT  1
-static tTestDesc aSco_UtimeTests[] = {
-  { TT_EGREP,    zSco_UtimeSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_LONGJMP_NORETURN_TEST_CT  2
+static tTestDesc aSolaris_Longjmp_NoreturnTests[] = {
+  { TT_NEGREP,   zSolaris_Longjmp_NoreturnBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Longjmp_NoreturnSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sco_Utime
+ *  Fix Command Arguments for Solaris_Longjmp_Noreturn
  */
-static const char* apzSco_UtimePatch[] = {
+static const char* apzSolaris_Longjmp_NoreturnPatch[] = {
     "format",
-    "(const char *, const struct utimbuf *);",
+    "%1 __attribute__ ((__noreturn__));",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -5786,16 +6781,7 @@ static tTestDesc aSolaris_Math_4Tests[] = {
 static const char* apzSolaris_Math_4Patch[] = {
     "format",
     "#define\tfpclassify(x) \\\n\
-  __extension__ ({ const __typeof(x) __x_fp = (x); \\\n\
-\t\t   isnan(__x_fp) \\\n\
-\t\t     ? FP_NAN \\\n\
-\t\t     : isinf(__x_fp) \\\n\
-\t\t       ? FP_INFINITE \\\n\
-\t\t       : isnormal(__x_fp) \\\n\
-\t\t\t ? FP_NORMAL \\\n\
-\t\t\t : __x_fp == 0.0 \\\n\
-\t\t\t   ? FP_ZERO \\\n\
-\t\t\t   : FP_SUBNORMAL; })",
+  __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL, FP_SUBNORMAL, FP_ZERO, (x))",
     "^#define[ \t]+fpclassify\\(x\\)[ \t]+__builtin_fpclassify\\(x\\)",
     (char*)NULL };
 
@@ -5820,7 +6806,7 @@ tSCC zSolaris_Math_8List[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zSolaris_Math_8Select0[] =
-       "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+       "@\\(#\\)math_c99\\.h[ \t]+1\\.[0-9]+[ \t]+[0-9/]+ SMI";
 
 /*
  *  content bypass pattern - skip fix if pattern found
@@ -5930,81 +6916,86 @@ static const char* apzSolaris_Math_10Patch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Mutex_Init_1 fix
+ *  Description of Solaris_Mutex_Init_2 fix
  */
-tSCC zSolaris_Mutex_Init_1Name[] =
-     "solaris_mutex_init_1";
+tSCC zSolaris_Mutex_Init_2Name[] =
+     "solaris_mutex_init_2";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Mutex_Init_1List[] =
+tSCC zSolaris_Mutex_Init_2List[] =
   "pthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Mutex_Init_1Machs (const char**)NULL
+tSCC* apzSolaris_Mutex_Init_2Machs[] = {
+        "*-*-solaris2.[0-9]",
+        "*-*-solaris2.[0-9][!0-9]*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Mutex_Init_1Select0[] =
-       "@\\(#\\)pthread.h[ \t]+1.1[0-9][ \t]+9[567]/[0-9/]+ SMI";
+tSCC zSolaris_Mutex_Init_2Select0[] =
+       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
 
-#define    SOLARIS_MUTEX_INIT_1_TEST_CT  1
-static tTestDesc aSolaris_Mutex_Init_1Tests[] = {
-  { TT_EGREP,    zSolaris_Mutex_Init_1Select0, (regex_t*)NULL }, };
+#define    SOLARIS_MUTEX_INIT_2_TEST_CT  1
+static tTestDesc aSolaris_Mutex_Init_2Tests[] = {
+  { TT_EGREP,    zSolaris_Mutex_Init_2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris_Mutex_Init_1
+ *  Fix Command Arguments for Solaris_Mutex_Init_2
  */
-static const char* apzSolaris_Mutex_Init_1Patch[] = { "sed",
-    "-e", "/define[ \t]*PTHREAD_MUTEX_INI/s/{0, 0,/{{{0}, 0}, {{{0}}},/\n\
-/define[ \t]*PTHREAD_COND_INI/s/{0,/{{{0},0},/",
+static const char* apzSolaris_Mutex_Init_2Patch[] = {
+    "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].*)$",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Mutex_Init_2 fix
+ *  Description of Solaris_Pow_Int_Overload fix
  */
-tSCC zSolaris_Mutex_Init_2Name[] =
-     "solaris_mutex_init_2";
+tSCC zSolaris_Pow_Int_OverloadName[] =
+     "solaris_pow_int_overload";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Mutex_Init_2List[] =
-  "pthread.h\0";
+tSCC zSolaris_Pow_Int_OverloadList[] =
+  "iso/math_iso.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_Mutex_Init_2Machs[] = {
-        "*-*-solaris2.[0-9]",
-        "*-*-solaris2.[0-9][!0-9]*",
+tSCC* apzSolaris_Pow_Int_OverloadMachs[] = {
+        "*-*-solaris2*",
         (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 zSolaris_Pow_Int_OverloadSelect0[] =
+       "^[ \t]*inline [a-z ]* pow\\([^()]*, int [^()]*\\) *\\{[^{}]*\n\
+[^{}]*\\}";
 
-#define    SOLARIS_MUTEX_INIT_2_TEST_CT  1
-static tTestDesc aSolaris_Mutex_Init_2Tests[] = {
-  { TT_EGREP,    zSolaris_Mutex_Init_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_Mutex_Init_2
+ *  Fix Command Arguments for Solaris_Pow_Int_Overload
  */
-static const char* apzSolaris_Mutex_Init_2Patch[] = {
+static const char* apzSolaris_Pow_Int_OverloadPatch[] = {
     "format",
-    "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
+    "#ifndef __GXX_EXPERIMENTAL_CXX0X__\n\
 %0\n\
-#else\n\
-%1, {0}}%4\n\
 #endif",
-    "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+(|/*.**/[ \t]*\\\\\n\
-[ \t]*)\\{.*),[ \t]*0\\}(|[ \t].*)$",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -6132,291 +7123,492 @@ static const char* apzSolaris_Once_Init_2Patch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Socket fix
+ *  Description of Solaris_Int_Const fix
  */
-tSCC zSolaris_SocketName[] =
-     "solaris_socket";
+tSCC zSolaris_Int_ConstName[] =
+     "solaris_int_const";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_SocketList[] =
-  "sys/socket.h\0";
+tSCC zSolaris_Int_ConstList[] =
+  "sys/int_const.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_SocketMachs (const char**)NULL
+tSCC* apzSolaris_Int_ConstMachs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_SocketSelect0[] =
-       "@\\(#\\)socket.h[ \t]+1.[123][0-9][ \t]+9[567]/[0-9/]+ SMI";
+tSCC zSolaris_Int_ConstSelect0[] =
+       "^#define[ \t]+UINT8_C\\(c\\)[ \t]+__CONCAT__.*\n\
+(/*.**/)\n\
+#define[ \t]+UINT16_C\\(c\\)[ \t]+__CONCAT__.*";
 
-#define    SOLARIS_SOCKET_TEST_CT  1
-static tTestDesc aSolaris_SocketTests[] = {
-  { TT_EGREP,    zSolaris_SocketSelect0, (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 Solaris_Socket
+ *  Fix Command Arguments for Solaris_Int_Const
  */
-static const char* apzSolaris_SocketPatch[] = {
+static const char* apzSolaris_Int_ConstPatch[] = {
     "format",
-    "extern int %1(int, %2void *, int, int);",
-    "^extern int (recv|send)\\(int, (const )*char \\*, int, int\\);",
+    "#define\tUINT8_C(c)\t(c)\n\
+%1\n\
+#define\tUINT16_C(c)\t(c)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Stdio_Tag fix
+ *  Description of Solaris_Int_Limits_1 fix
  */
-tSCC zSolaris_Stdio_TagName[] =
-     "solaris_stdio_tag";
+tSCC zSolaris_Int_Limits_1Name[] =
+     "solaris_int_limits_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_Stdio_TagList[] =
-  "stdio_tag.h\0";
+tSCC zSolaris_Int_Limits_1List[] =
+  "sys/int_limits.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_Stdio_TagMachs (const char**)NULL
+tSCC* apzSolaris_Int_Limits_1Machs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_Stdio_TagSelect0[] =
-       "__cplusplus < 54321L";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_Stdio_TagBypass0[] =
-       "__GNUC__";
+tSCC zSolaris_Int_Limits_1Select0[] =
+       "^#define[ \t]+UINT8_MAX[ \t]+\\(255U\\)\n\
+#define[ \t]+UINT16_MAX[ \t]+\\(65535U\\)";
 
-#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    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 Solaris_Stdio_Tag
+ *  Fix Command Arguments for Solaris_Int_Limits_1
  */
-static const char* apzSolaris_Stdio_TagPatch[] = { "sed",
-    "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/",
+static const char* apzSolaris_Int_Limits_1Patch[] = {
+    "format",
+    "#define\tUINT8_MAX\t(255)\n\
+#define\tUINT16_MAX\t(65535)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Unistd fix
+ *  Description of Solaris_Int_Limits_2 fix
  */
-tSCC zSolaris_UnistdName[] =
-     "solaris_unistd";
+tSCC zSolaris_Int_Limits_2Name[] =
+     "solaris_int_limits_2";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_UnistdList[] =
-  "unistd.h\0";
+tSCC zSolaris_Int_Limits_2List[] =
+  "sys/int_limits.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris_UnistdMachs (const char**)NULL
+tSCC* apzSolaris_Int_Limits_2Machs[] = {
+        "*-*-solaris2*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_UnistdSelect0[] =
-       "@\\(#\\)unistd.h[ \t]+1.3[0-9][ \t]+9[567]/[0-9/]+ SMI";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_UnistdBypass0[] =
-       "getpagesize";
+tSCC zSolaris_Int_Limits_2Select0[] =
+       "^#define[ \t]+(INT|UINT)_FAST16_(MAX|MIN)[ \t](INT|UINT)16.*";
 
-#define    SOLARIS_UNISTD_TEST_CT  2
-static tTestDesc aSolaris_UnistdTests[] = {
-  { TT_NEGREP,   zSolaris_UnistdBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_UnistdSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_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 Solaris_Unistd
+ *  Fix Command Arguments for Solaris_Int_Limits_2
  */
-static const char* apzSolaris_UnistdPatch[] = {
+static const char* apzSolaris_Int_Limits_2Patch[] = {
     "format",
-    "extern int getpagesize();\n\
-%0",
-    "^extern (pid_t|int) getpgid\\(.*\\);",
+    "#define\t%1_FAST16_%2 %132_%2",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris_Widec fix
+ *  Description of Solaris_Int_Limits_3 fix
  */
-tSCC zSolaris_WidecName[] =
-     "solaris_widec";
+tSCC zSolaris_Int_Limits_3Name[] =
+     "solaris_int_limits_3";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris_WidecList[] =
-  "widec.h\0";
+tSCC zSolaris_Int_Limits_3List[] =
+  "sys/int_limits.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSolaris_WidecMachs[] = {
-        "*-*-solaris2.[0-5]",
-        "*-*-solaris2.[0-5].*",
+tSCC* apzSolaris_Int_Limits_3Machs[] = {
+        "*-*-solaris2*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris_WidecSelect0[] =
-       "#include <euc.h>";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSolaris_WidecBypass0[] =
-       "include.*wchar\\.h";
+tSCC zSolaris_Int_Limits_3Select0[] =
+       "^#define[ \t]+SIZE_MAX[ \t]+4294967295UL";
 
-#define    SOLARIS_WIDEC_TEST_CT  2
-static tTestDesc aSolaris_WidecTests[] = {
-  { TT_NEGREP,   zSolaris_WidecBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSolaris_WidecSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_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 Solaris_Widec
+ *  Fix Command Arguments for Solaris_Int_Limits_3
  */
-static const char* apzSolaris_WidecPatch[] = {
+static const char* apzSolaris_Int_Limits_3Patch[] = {
     "format",
-    "%0\n\
-#include <wchar.h>",
+    "#define\tSIZE_MAX\t4294967295U",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Statsswtch fix
+ *  Description of Solaris_Int_Types fix
  */
-tSCC zStatsswtchName[] =
-     "statsswtch";
+tSCC zSolaris_Int_TypesName[] =
+     "solaris_int_types";
 
 /*
  *  File name selection pattern
  */
-tSCC zStatsswtchList[] =
-  "rpcsvc/rstat.h\0";
+tSCC zSolaris_Int_TypesList[] =
+  "sys/int_types.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzStatsswtchMachs (const char**)NULL
+#define apzSolaris_Int_TypesMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zStatsswtchSelect0[] =
-       "boottime$";
+tSCC zSolaris_Int_TypesSelect0[] =
+       "__STDC__ - 0 == 0";
 
-#define    STATSSWTCH_TEST_CT  1
-static tTestDesc aStatsswtchTests[] = {
-  { TT_EGREP,    zStatsswtchSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Int_TypesBypass0[] =
+       "_LONGLONG_TYPE";
+
+#define    SOLARIS_INT_TYPES_TEST_CT  2
+static tTestDesc aSolaris_Int_TypesTests[] = {
+  { TT_NEGREP,   zSolaris_Int_TypesBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_Int_TypesSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Statsswtch
+ *  Fix Command Arguments for Solaris_Int_Types
  */
-static const char* apzStatsswtchPatch[] = {
+static const char* apzSolaris_Int_TypesPatch[] = {
     "format",
-    "boottime;",
+    "(defined(_STDC_C99) || !defined(_STRICT_STDC) || defined(__GNUC__))",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Stdio_Stdarg_H fix
+ *  Description of Solaris_Posix_Spawn_Restrict fix
  */
-tSCC zStdio_Stdarg_HName[] =
-     "stdio_stdarg_h";
+tSCC zSolaris_Posix_Spawn_RestrictName[] =
+     "solaris_posix_spawn_restrict";
 
 /*
  *  File name selection pattern
  */
-tSCC zStdio_Stdarg_HList[] =
-  "stdio.h\0";
+tSCC zSolaris_Posix_Spawn_RestrictList[] =
+  "spawn.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzStdio_Stdarg_HMachs[] = {
-        "*-*-solaris2.1[0-9]*",
+tSCC* apzSolaris_Posix_Spawn_RestrictMachs[] = {
+        "*-*-solaris2*",
         (const char*)NULL };
 
 /*
- *  content bypass pattern - skip fix if pattern found
+ *  content selection pattern - do fix if pattern found
  */
-tSCC zStdio_Stdarg_HBypass0[] =
-       "include.*(stdarg.h|machine/ansi.h)";
+tSCC zSolaris_Posix_Spawn_RestrictSelect0[] =
+       "(.*[ \t]+)([a-z]+)\\[_RESTRICT_KYWD\\](.*)";
 
-#define    STDIO_STDARG_H_TEST_CT  1
-static tTestDesc aStdio_Stdarg_HTests[] = {
-  { TT_NEGREP,   zStdio_Stdarg_HBypass0, (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 Stdio_Stdarg_H
+ *  Fix Command Arguments for Solaris_Posix_Spawn_Restrict
  */
-static const char* apzStdio_Stdarg_HPatch[] = {
-    "wrap",
-    "#define __need___va_list\n\
-#include <stdarg.h>\n",
+static const char* apzSolaris_Posix_Spawn_RestrictPatch[] = {
+    "format",
+    "%1*_RESTRICT_KYWD %2%3",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Stdio_Va_List fix
+ *  Description of Solaris_Std___Filbuf fix
  */
-tSCC zStdio_Va_ListName[] =
-     "stdio_va_list";
+tSCC zSolaris_Std___FilbufName[] =
+     "solaris_std___filbuf";
 
 /*
  *  File name selection pattern
  */
-tSCC zStdio_Va_ListList[] =
-  "stdio.h\0internal/stdio_core.h\0internal/wchar_core.h\0";
+tSCC zSolaris_Std___FilbufList[] =
+  "stdio.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzStdio_Va_ListMachs[] = {
-        "*-*-solaris2.1[0-9]*",
+tSCC* apzSolaris_Std___FilbufMachs[] = {
+        "*-*-solaris2*",
         (const char*)NULL };
 
 /*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Std___FilbufSelect0[] =
+       "(using std::perror;\n\
+)(#endif)";
+
+/*
  *  content bypass pattern - skip fix if pattern found
  */
-tSCC zStdio_Va_ListBypass0[] =
-       "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list";
+tSCC zSolaris_Std___FilbufBypass0[] =
+       "using std::__filbuf";
 
-#define    STDIO_VA_LIST_TEST_CT  1
-static tTestDesc aStdio_Va_ListTests[] = {
-  { TT_NEGREP,   zStdio_Va_ListBypass0, (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 Stdio_Va_List
+ *  Fix Command Arguments for Solaris_Std___Filbuf
  */
-static const char* apzStdio_Va_ListPatch[] = { "sed",
-    "-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\
-s@(va_list)&@(__gnuc_va_list)\\&@\n\
-s@ _VA_LIST_));@ __gnuc_va_list));@\n\
-s@ __VA_LIST__));@ __gnuc_va_list));@\n\
-s@ va_list@ __not_va_list__@\n\
-s@\\*va_list@*__not_va_list__@\n\
-s@ __va_list)@ __gnuc_va_list)@\n\
-s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\
-s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n\
-s@GNUC_VA_LIST@GNUC_Va_LIST@\n\
-s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n\
-s@_NEED___VA_LIST@_NEED___Va_LIST@\n\
-s@VA_LIST@DUMMY_VA_LIST@\n\
-s@_Va_LIST@_VA_LIST@",
+static const char* apzSolaris_Std___FilbufPatch[] = {
+    "format",
+    "%1#ifndef _LP64\n\
+using std::__filbuf;\n\
+using std::__flsbuf;\n\
+#endif\n\
+%2",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Solaris_Stdio_Tag fix
+ */
+tSCC zSolaris_Stdio_TagName[] =
+     "solaris_stdio_tag";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSolaris_Stdio_TagList[] =
+  "stdio_tag.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSolaris_Stdio_TagMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Stdio_TagSelect0[] =
+       "__cplusplus < 54321L";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_Stdio_TagBypass0[] =
+       "__GNUC__";
+
+#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_Stdio_Tag
+ */
+static const char* apzSolaris_Stdio_TagPatch[] = { sed_cmd_z,
+    "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Solaris_Sys_Va_List fix
+ */
+tSCC zSolaris_Sys_Va_ListName[] =
+     "solaris_sys_va_list";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSolaris_Sys_Va_ListList[] =
+  "sys/va_list.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Sys_Va_ListMachs[] = {
+        "*-*-solaris2.[89]",
+        (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";
+
+#define    SOLARIS_SYS_VA_LIST_TEST_CT  1
+static tTestDesc aSolaris_Sys_Va_ListTests[] = {
+  { TT_EGREP,    zSolaris_Sys_Va_ListSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Solaris_Sys_Va_List
+ */
+static const char* apzSolaris_Sys_Va_ListPatch[] = {
+    "format",
+    "#ifdef __GNUC__\n\
+typedef __builtin_va_list __va_list;\n\
+#else\n\
+%0\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Statsswtch fix
+ */
+tSCC zStatsswtchName[] =
+     "statsswtch";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zStatsswtchList[] =
+  "rpcsvc/rstat.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzStatsswtchMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zStatsswtchSelect0[] =
+       "boottime$";
+
+#define    STATSSWTCH_TEST_CT  1
+static tTestDesc aStatsswtchTests[] = {
+  { TT_EGREP,    zStatsswtchSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Statsswtch
+ */
+static const char* apzStatsswtchPatch[] = {
+    "format",
+    "boottime;",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Stdio_Stdarg_H fix
+ */
+tSCC zStdio_Stdarg_HName[] =
+     "stdio_stdarg_h";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zStdio_Stdarg_HList[] =
+  "stdio.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzStdio_Stdarg_HMachs[] = {
+        "*-*-solaris2.1[0-9]*",
+        (const char*)NULL };
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zStdio_Stdarg_HBypass0[] =
+       "include.*(stdarg.h|machine/ansi.h)";
+
+#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 Stdio_Va_List fix
+ */
+tSCC zStdio_Va_ListName[] =
+     "stdio_va_list";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zStdio_Va_ListList[] =
+  "stdio.h\0internal/stdio_core.h\0internal/wchar_core.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzStdio_Va_ListMachs[] = {
+        "*-*-solaris2.1[0-9]*",
+        (const char*)NULL };
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zStdio_Va_ListBypass0[] =
+       "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list";
+
+#define    STDIO_VA_LIST_TEST_CT  1
+static tTestDesc aStdio_Va_ListTests[] = {
+  { TT_NEGREP,   zStdio_Va_ListBypass0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Stdio_Va_List
+ */
+static const char* apzStdio_Va_ListPatch[] = { sed_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 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -6452,7 +7644,7 @@ static tTestDesc aStdio_Va_List_ClientsTests[] = {
 /*
  *  Fix Command Arguments for Stdio_Va_List_Clients
  */
-static const char* apzStdio_Va_List_ClientsPatch[] = { "sed",
+static const char* apzStdio_Va_List_ClientsPatch[] = { sed_cmd_z,
     "-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\
 s@(va_list)&@(__gnuc_va_list)\\&@\n\
 s@ _VA_LIST_));@ __gnuc_va_list));@\n\
@@ -6833,7 +8025,7 @@ static tTestDesc aSun_MallocTests[] = {
 /*
  *  Fix Command Arguments for Sun_Malloc
  */
-static const char* apzSun_MallocPatch[] = { "sed",
+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",
@@ -6871,7 +8063,7 @@ static tTestDesc aSun_Rusers_SemiTests[] = {
 /*
  *  Fix Command Arguments for Sun_Rusers_Semi
  */
-static const char* apzSun_Rusers_SemiPatch[] = { "sed",
+static const char* apzSun_Rusers_SemiPatch[] = { sed_cmd_z,
     "-e", "/^struct/,/^};/s/_cnt$/_cnt;/",
     (char*)NULL };
 
@@ -6979,7 +8171,7 @@ static tTestDesc aSvr4_Disable_OptTests[] = {
 /*
  *  Fix Command Arguments for Svr4_Disable_Opt
  */
-static const char* apzSvr4_Disable_OptPatch[] = { "sed",
+static const char* apzSvr4_Disable_OptPatch[] = { sed_cmd_z,
     "-e", "/#define.*__std_hdr_/d",
     (char*)NULL };
 
@@ -7020,45 +8212,6 @@ static const char* apzSvr4_GetcwdPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Svr4_Krnl fix
- */
-tSCC zSvr4_KrnlName[] =
-     "svr4_krnl";
-
-/*
- *  File name selection pattern
- */
-tSCC zSvr4_KrnlList[] =
-  "fs/rfs/rf_cache.h\0sys/erec.h\0sys/err.h\0sys/char.h\0sys/getpages.h\0sys/map.h\0sys/cmn_err.h\0sys/kdebugger.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzSvr4_KrnlMachs[] = {
-        "*-*-sysv4*",
-        "i?86-sequent-ptx*",
-        (const char*)NULL };
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSvr4_KrnlBypass0[] =
-       "_KERNEL";
-
-#define    SVR4_KRNL_TEST_CT  1
-static tTestDesc aSvr4_KrnlTests[] = {
-  { TT_NEGREP,   zSvr4_KrnlBypass0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Svr4_Krnl
- */
-static const char* apzSvr4_KrnlPatch[] = {
-    "wrap",
-    "#ifdef _KERNEL\n",
-    "#endif /* _KERNEL */\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Svr4_Profil fix
  */
 tSCC zSvr4_ProfilName[] =
@@ -7208,7 +8361,7 @@ static tTestDesc aSysv68_StringTests[] = {
 /*
  *  Fix Command Arguments for Sysv68_String
  */
-static const char* apzSysv68_StringPatch[] = { "sed",
+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);/",
@@ -7232,898 +8385,328 @@ tSCC zSysz_Stdlib_For_SunName[] =
 /*
  *  File name selection pattern
  */
-tSCC zSysz_Stdlib_For_SunList[] =
-  "stdlib.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzSysz_Stdlib_For_SunMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zSysz_Stdlib_For_SunSelect0[] =
-       "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\(";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zSysz_Stdlib_For_SunBypass0[] =
-       "_CLASSIC_ANSI_TYPES";
-
-#define    SYSZ_STDLIB_FOR_SUN_TEST_CT  2
-static tTestDesc aSysz_Stdlib_For_SunTests[] = {
-  { TT_NEGREP,   zSysz_Stdlib_For_SunBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zSysz_Stdlib_For_SunSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Sysz_Stdlib_For_Sun
- */
-static const char* apzSysz_Stdlib_For_SunPatch[] = {
-    "format",
-    "void *\t%1(",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Thread_Keyword fix
- */
-tSCC zThread_KeywordName[] =
-     "thread_keyword";
-
-/*
- *  File name selection pattern
- */
-tSCC zThread_KeywordList[] =
-  "pthread.h\0bits/sigthread.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzThread_KeywordMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zThread_KeywordSelect0[] =
-       "([* ])__thread([,)])";
-
-#define    THREAD_KEYWORD_TEST_CT  1
-static tTestDesc aThread_KeywordTests[] = {
-  { TT_EGREP,    zThread_KeywordSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Thread_Keyword
- */
-static const char* apzThread_KeywordPatch[] = {
-    "format",
-    "%1__thr%2",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Tinfo_Cplusplus fix
- */
-tSCC zTinfo_CplusplusName[] =
-     "tinfo_cplusplus";
-
-/*
- *  File name selection pattern
- */
-tSCC zTinfo_CplusplusList[] =
-  "tinfo.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzTinfo_CplusplusMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zTinfo_CplusplusSelect0[] =
-       "[ \t]_cplusplus";
-
-#define    TINFO_CPLUSPLUS_TEST_CT  1
-static tTestDesc aTinfo_CplusplusTests[] = {
-  { TT_EGREP,    zTinfo_CplusplusSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Tinfo_Cplusplus
- */
-static const char* apzTinfo_CplusplusPatch[] = {
-    "format",
-    " __cplusplus",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Atexit_Param fix
- */
-tSCC zUltrix_Atexit_ParamName[] =
-     "ultrix_atexit_param";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Atexit_ParamList[] =
-  "stdlib.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Atexit_ParamMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Atexit_ParamSelect0[] =
-       "atexit\\(.*\\(\\)";
-
-#define    ULTRIX_ATEXIT_PARAM_TEST_CT  1
-static tTestDesc aUltrix_Atexit_ParamTests[] = {
-  { TT_EGREP,    zUltrix_Atexit_ParamSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Atexit_Param
- */
-static const char* apzUltrix_Atexit_ParamPatch[] = {
-    "format",
-    "atexit( void (*__func)( void )",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Atof_Param fix
- */
-tSCC zUltrix_Atof_ParamName[] =
-     "ultrix_atof_param";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Atof_ParamList[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Atof_ParamMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Atof_ParamSelect0[] =
-       "atof\\([ \t]*char";
-
-#define    ULTRIX_ATOF_PARAM_TEST_CT  1
-static tTestDesc aUltrix_Atof_ParamTests[] = {
-  { TT_EGREP,    zUltrix_Atof_ParamSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Atof_Param
- */
-static const char* apzUltrix_Atof_ParamPatch[] = {
-    "format",
-    "atof(const char",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Const fix
- */
-tSCC zUltrix_ConstName[] =
-     "ultrix_const";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_ConstList[] =
-  "stdio.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_ConstMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_ConstSelect0[] =
-       "perror\\( char \\*";
-
-#define    ULTRIX_CONST_TEST_CT  1
-static tTestDesc aUltrix_ConstTests[] = {
-  { TT_EGREP,    zUltrix_ConstSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Const
- */
-static const char* apzUltrix_ConstPatch[] = {
-    "format",
-    "%1 const %3 *__",
-    "([ \t*](perror|fputs|fwrite|scanf|fscanf)\\(.*)[ \t]+(char|void) \\*__",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Const2 fix
- */
-tSCC zUltrix_Const2Name[] =
-     "ultrix_const2";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Const2List[] =
-  "stdio.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Const2Machs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Const2Select0[] =
-       "\\*fopen\\( char \\*";
-
-#define    ULTRIX_CONST2_TEST_CT  1
-static tTestDesc aUltrix_Const2Tests[] = {
-  { TT_EGREP,    zUltrix_Const2Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Const2
- */
-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 Ultrix_Const3 fix
- */
-tSCC zUltrix_Const3Name[] =
-     "ultrix_const3";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Const3List[] =
-  "stdio.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Const3Machs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Const3Select0[] =
-       "fdopen\\( .*, char \\*";
-
-#define    ULTRIX_CONST3_TEST_CT  1
-static tTestDesc aUltrix_Const3Tests[] = {
-  { TT_EGREP,    zUltrix_Const3Select0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Const3
- */
-static const char* apzUltrix_Const3Patch[] = {
-    "format",
-    "%1 const %3 *__",
-    "([ \t*](fdopen)\\(.*)[ \t]+(char|void) \\*__",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Fix_Fixproto fix
- */
-tSCC zUltrix_Fix_FixprotoName[] =
-     "ultrix_fix_fixproto";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Fix_FixprotoList[] =
-  "sys/utsname.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Fix_FixprotoMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Fix_FixprotoSelect0[] =
-       "ULTRIX";
-
-#define    ULTRIX_FIX_FIXPROTO_TEST_CT  1
-static tTestDesc aUltrix_Fix_FixprotoTests[] = {
-  { TT_EGREP,    zUltrix_Fix_FixprotoSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Fix_Fixproto
- */
-static const char* apzUltrix_Fix_FixprotoPatch[] = {
-    "format",
-    "struct utsname;\n\
-%0",
-    "^[ \t]*extern[ \t]*int[ \t]*uname\\(\\);",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Ifdef fix
- */
-tSCC zUltrix_IfdefName[] =
-     "ultrix_ifdef";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_IfdefList[] =
-  "sys/file.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_IfdefMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_IfdefSelect0[] =
-       "^#ifdef KERNEL[ \t]+&&";
-
-#define    ULTRIX_IFDEF_TEST_CT  1
-static tTestDesc aUltrix_IfdefTests[] = {
-  { TT_EGREP,    zUltrix_IfdefSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Ifdef
- */
-static const char* apzUltrix_IfdefPatch[] = {
-    "format",
-    "#if defined(KERNEL) &&",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Locale fix
- */
-tSCC zUltrix_LocaleName[] =
-     "ultrix_locale";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_LocaleList[] =
-  "locale.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_LocaleMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_LocaleSelect0[] =
-       "@\\(#\\)locale\\.h.*6\\.1.*\\(ULTRIX\\)";
-
-#define    ULTRIX_LOCALE_TEST_CT  1
-static tTestDesc aUltrix_LocaleTests[] = {
-  { TT_EGREP,    zUltrix_LocaleSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Locale
- */
-static const char* apzUltrix_LocalePatch[] = {
-    "wrap",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Math_Ifdef fix
- */
-tSCC zUltrix_Math_IfdefName[] =
-     "ultrix_math_ifdef";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Math_IfdefList[] =
-  "sys/limits.h\0float.h\0math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Math_IfdefMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Math_IfdefSelect0[] =
-       "^(#if.*)\\|\\|[ \t]+CC\\$[a-z]+";
-
-#define    ULTRIX_MATH_IFDEF_TEST_CT  1
-static tTestDesc aUltrix_Math_IfdefTests[] = {
-  { TT_EGREP,    zUltrix_Math_IfdefSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Math_Ifdef
- */
-static const char* apzUltrix_Math_IfdefPatch[] = {
-    "format",
-    "%1",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Nested_Ioctl fix
- */
-tSCC zUltrix_Nested_IoctlName[] =
-     "ultrix_nested_ioctl";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Nested_IoctlList[] =
-  "sys/ioctl.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Nested_IoctlMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Nested_IoctlSelect0[] =
-       "^/\\* #define SIOCSCREEN";
-
-#define    ULTRIX_NESTED_IOCTL_TEST_CT  1
-static tTestDesc aUltrix_Nested_IoctlTests[] = {
-  { TT_EGREP,    zUltrix_Nested_IoctlSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Nested_Ioctl
- */
-static const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
-    "-e", "/^\\/\\* #define SIOCSCREEN/s@/\\* screend@*//* screend@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Nested_Svc fix
- */
-tSCC zUltrix_Nested_SvcName[] =
-     "ultrix_nested_svc";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_Nested_SvcList[] =
-  "rpc/svc.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_Nested_SvcMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_Nested_SvcSelect0[] =
-       "^ \\*[ \t]*int protocol;  */\\*";
-
-#define    ULTRIX_NESTED_SVC_TEST_CT  1
-static tTestDesc aUltrix_Nested_SvcTests[] = {
-  { TT_EGREP,    zUltrix_Nested_SvcSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Nested_Svc
- */
-static const char* apzUltrix_Nested_SvcPatch[] = { "sed",
-    "-e", "s@^\\( \\*\tint protocol;  \\)/\\*@\\1*/ /*@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Stat fix
- */
-tSCC zUltrix_StatName[] =
-     "ultrix_stat";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_StatList[] =
-  "sys/stat.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzUltrix_StatMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zUltrix_StatSelect0[] =
-       "@\\(#\\)stat\\.h.*6\\.1.*\\(ULTRIX\\)";
-
-#define    ULTRIX_STAT_TEST_CT  1
-static tTestDesc aUltrix_StatTests[] = {
-  { TT_EGREP,    zUltrix_StatSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Ultrix_Stat
- */
-static const char* apzUltrix_StatPatch[] = { "sed",
-    "-e", "/^#define[ \t]S_IFPORT[ \t]*S_IFIFO$/a\\\n\
-\\\n\
-/* macro to test for symbolic link */\\\n\
-#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)\\\n\n",
-    "-e", "/^[ \t]*fstat(),$/a\\\n\
-\tlstat(),\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Ultrix_Static fix
- */
-tSCC zUltrix_StaticName[] =
-     "ultrix_static";
-
-/*
- *  File name selection pattern
- */
-tSCC zUltrix_StaticList[] =
-  "machine/cpu.h\0";
+tSCC zSysz_Stdlib_For_SunList[] =
+  "stdlib.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzUltrix_StaticMachs (const char**)NULL
+#define apzSysz_Stdlib_For_SunMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zUltrix_StaticSelect0[] =
-       "#include \"r[34]_cpu";
+tSCC zSysz_Stdlib_For_SunSelect0[] =
+       "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\(";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSysz_Stdlib_For_SunBypass0[] =
+       "_CLASSIC_ANSI_TYPES";
 
-#define    ULTRIX_STATIC_TEST_CT  1
-static tTestDesc aUltrix_StaticTests[] = {
-  { TT_EGREP,    zUltrix_StaticSelect0, (regex_t*)NULL }, };
+#define    SYSZ_STDLIB_FOR_SUN_TEST_CT  2
+static tTestDesc aSysz_Stdlib_For_SunTests[] = {
+  { TT_NEGREP,   zSysz_Stdlib_For_SunBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSysz_Stdlib_For_SunSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Ultrix_Static
+ *  Fix Command Arguments for Sysz_Stdlib_For_Sun
  */
-static const char* apzUltrix_StaticPatch[] = { "sed",
-    "-e", "s/^static struct tlb_pid_state/struct tlb_pid_state/",
-    "-e", "s/^#include \"r3_cpu\\.h\"$/#include <machine\\/r3_cpu\\.h>/",
-    "-e", "s/^#include \"r4_cpu\\.h\"$/#include <machine\\/r4_cpu\\.h>/",
+static const char* apzSysz_Stdlib_For_SunPatch[] = {
+    "format",
+    "void *\t%1(",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Ultrix_Stdlib fix
+ *  Description of Thread_Keyword fix
  */
-tSCC zUltrix_StdlibName[] =
-     "ultrix_stdlib";
+tSCC zThread_KeywordName[] =
+     "thread_keyword";
 
 /*
  *  File name selection pattern
  */
-tSCC zUltrix_StdlibList[] =
-  "stdlib.h\0";
+tSCC zThread_KeywordList[] =
+  "pthread.h\0bits/sigthread.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzUltrix_StdlibMachs (const char**)NULL
+#define apzThread_KeywordMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zUltrix_StdlibSelect0[] =
-       "@\\(#\\)stdlib\\.h.*6\\.1.*\\(ULTRIX\\)";
+tSCC zThread_KeywordSelect0[] =
+       "([* ])__thread([,)])";
 
-#define    ULTRIX_STDLIB_TEST_CT  1
-static tTestDesc aUltrix_StdlibTests[] = {
-  { TT_EGREP,    zUltrix_StdlibSelect0, (regex_t*)NULL }, };
+#define    THREAD_KEYWORD_TEST_CT  1
+static tTestDesc aThread_KeywordTests[] = {
+  { TT_EGREP,    zThread_KeywordSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Ultrix_Stdlib
+ *  Fix Command Arguments for Thread_Keyword
  */
-static const char* apzUltrix_StdlibPatch[] = { "sed",
-    "-e", "/^char.*getenv( const char .* );.*$/a\\\n\
-int\t\tsetenv( const char *__name, const char *__val, int __ovrwrt );\\\n\
-void\t\tunsetenv( const char *__name );\\\n\
-int\t\tputenv( char *__s );\n",
-    "-e", "/^char.*getenv();.*$/a\\\n\
-int\tsetenv();\\\n\
-void\tunsetenv();\\\n\
-int\tputenv();\n",
+static const char* apzThread_KeywordPatch[] = {
+    "format",
+    "%1__thr%2",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Ultrix_Strings fix
+ *  Description of Tinfo_Cplusplus fix
  */
-tSCC zUltrix_StringsName[] =
-     "ultrix_strings";
+tSCC zTinfo_CplusplusName[] =
+     "tinfo_cplusplus";
 
 /*
  *  File name selection pattern
  */
-tSCC zUltrix_StringsList[] =
-  "strings.h\0";
+tSCC zTinfo_CplusplusList[] =
+  "tinfo.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzUltrix_StringsMachs (const char**)NULL
+#define apzTinfo_CplusplusMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zUltrix_StringsSelect0[] =
-       "@\\(#\\)strings\\.h.*6\\.1.*\\(ULTRIX\\)";
+tSCC zTinfo_CplusplusSelect0[] =
+       "[ \t]_cplusplus";
 
-#define    ULTRIX_STRINGS_TEST_CT  1
-static tTestDesc aUltrix_StringsTests[] = {
-  { TT_EGREP,    zUltrix_StringsSelect0, (regex_t*)NULL }, };
+#define    TINFO_CPLUSPLUS_TEST_CT  1
+static tTestDesc aTinfo_CplusplusTests[] = {
+  { TT_EGREP,    zTinfo_CplusplusSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Ultrix_Strings
+ *  Fix Command Arguments for Tinfo_Cplusplus
  */
-static const char* apzUltrix_StringsPatch[] = {
-    "wrap",
+static const char* apzTinfo_CplusplusPatch[] = {
+    "format",
+    " __cplusplus",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Ultrix_Strings2 fix
+ *  Description of Ultrix_Const fix
  */
-tSCC zUltrix_Strings2Name[] =
-     "ultrix_strings2";
+tSCC zUltrix_ConstName[] =
+     "ultrix_const";
 
 /*
  *  File name selection pattern
  */
-tSCC zUltrix_Strings2List[] =
-  "strings.h\0";
+tSCC zUltrix_ConstList[] =
+  "stdio.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzUltrix_Strings2Machs (const char**)NULL
+#define apzUltrix_ConstMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zUltrix_Strings2Select0[] =
-       "@\\(#\\)strings\\.h.*6\\.1.*\\(ULTRIX\\)";
+tSCC zUltrix_ConstSelect0[] =
+       "perror\\( char \\*";
 
-#define    ULTRIX_STRINGS2_TEST_CT  1
-static tTestDesc aUltrix_Strings2Tests[] = {
-  { TT_EGREP,    zUltrix_Strings2Select0, (regex_t*)NULL }, };
+#define    ULTRIX_CONST_TEST_CT  1
+static tTestDesc aUltrix_ConstTests[] = {
+  { TT_EGREP,    zUltrix_ConstSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Ultrix_Strings2
+ *  Fix Command Arguments for Ultrix_Const
  */
-static const char* apzUltrix_Strings2Patch[] = { "sed",
-    "-e", "/^.*strncmp( const .* );.*/a\\\n\
-\\\n\
-extern int\\\n\
-\tstrcasecmp( const char *__s1, const char *__s2),\\\n\
-\tstrncasecmp( const char *__s1, const char *__s2, size_t __n );\n",
-    "-e", "/^.*strncmp();.*/a\\\n\
-extern int\\\n\
-\tstrcasecmp(),\\\n\
-\tstrncasecmp();\n",
+static const char* apzUltrix_ConstPatch[] = {
+    "format",
+    "%1 const %3 *__",
+    "([ \t*](perror|fputs|fwrite|scanf|fscanf)\\(.*)[ \t]+(char|void) \\*__",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Ultrix_Sys_Time fix
+ *  Description of Ultrix_Const2 fix
  */
-tSCC zUltrix_Sys_TimeName[] =
-     "ultrix_sys_time";
+tSCC zUltrix_Const2Name[] =
+     "ultrix_const2";
 
 /*
  *  File name selection pattern
  */
-tSCC zUltrix_Sys_TimeList[] =
-  "sys/time.h\0";
+tSCC zUltrix_Const2List[] =
+  "stdio.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzUltrix_Sys_TimeMachs (const char**)NULL
+#define apzUltrix_Const2Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zUltrix_Sys_TimeSelect0[] =
-       "@\\(#\\)time\\.h.*6\\.1.*\\(ULTRIX\\)";
+tSCC zUltrix_Const2Select0[] =
+       "\\*fopen\\( char \\*";
 
-#define    ULTRIX_SYS_TIME_TEST_CT  1
-static tTestDesc aUltrix_Sys_TimeTests[] = {
-  { TT_EGREP,    zUltrix_Sys_TimeSelect0, (regex_t*)NULL }, };
+#define    ULTRIX_CONST2_TEST_CT  1
+static tTestDesc aUltrix_Const2Tests[] = {
+  { TT_EGREP,    zUltrix_Const2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Ultrix_Sys_Time
+ *  Fix Command Arguments for Ultrix_Const2
  */
-static const char* apzUltrix_Sys_TimePatch[] = { "sed",
-    "-e", "/^extern.*time_t.*time( time_t .* );.*$/a\\\n\
-\\\n\
-extern int adjtime(struct timeval *, struct timeval *);\\\n\
-extern int getitimer(int, struct itimerval *);\\\n\
-extern int setitimer(int, struct itimerval *, struct itimerval *);\\\n\
-extern int gettimeofday(struct timeval *, struct timezone *);\\\n\
-extern int settimeofday(struct timeval *, struct timezone *);\\\n\
-extern void profil(const void *, size_t, size_t, unsigned int);\\\n\
-extern int stime(const time_t *);\\\n\
-extern int utimes(const char *, const struct timeval[2]);\\\n\
-extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);\n",
-    "-e", "/^extern.*double.*difftime();.*$/a\\\n\
-extern\tint adjtime();\\\n\
-extern\tint getitimer();\\\n\
-extern\tint setitimer();\\\n\
-extern\tint gettimeofday();\\\n\
-extern\tint settimeofday();\\\n\
-extern\tvoid profil();\\\n\
-extern\tint stime();\\\n\
-extern\tint utimes();\\\n\
-extern\tint select();\n",
+static const char* 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 Ultrix_Unistd fix
+ *  Description of Va_I960_Macro fix
  */
-tSCC zUltrix_UnistdName[] =
-     "ultrix_unistd";
+tSCC zVa_I960_MacroName[] =
+     "va_i960_macro";
 
 /*
  *  File name selection pattern
  */
-tSCC zUltrix_UnistdList[] =
-  "unistd.h\0";
+tSCC zVa_I960_MacroList[] =
+  "arch/i960/archI960.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzUltrix_UnistdMachs (const char**)NULL
+#define apzVa_I960_MacroMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zUltrix_UnistdSelect0[] =
-       "@\\(#\\)unistd\\.h.*6\\.1.*\\(ULTRIX\\)";
+tSCC zVa_I960_MacroSelect0[] =
+       "__(vsiz|vali|vpad|alignof__)";
 
-#define    ULTRIX_UNISTD_TEST_CT  1
-static tTestDesc aUltrix_UnistdTests[] = {
-  { TT_EGREP,    zUltrix_UnistdSelect0, (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 Ultrix_Unistd
+ *  Fix Command Arguments for Va_I960_Macro
  */
-static const char* apzUltrix_UnistdPatch[] = { "sed",
-    "-e", "/^[ \t]*getgroups(),.*$/a\\\n\
-\tgetpagesize(),\n",
-    "-e", "/^[ \t]*fork(),.*$/a\\\n\
-\tvfork(),\n",
+static const char* apzVa_I960_MacroPatch[] = {
+    "format",
+    "__vx%1",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Unicosmk_Restrict fix
+ *  Description of Vms_Define_Can_Use_Extern_Prefix fix
  */
-tSCC zUnicosmk_RestrictName[] =
-     "unicosmk_restrict";
+tSCC zVms_Define_Can_Use_Extern_PrefixName[] =
+     "vms_define_can_use_extern_prefix";
 
 /*
  *  File name selection pattern
  */
-tSCC zUnicosmk_RestrictList[] =
-  "stdio.h\0stdlib.h\0wchar.h\0";
+tSCC zVms_Define_Can_Use_Extern_PrefixList[] =
+  "rtldef/decc$types.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzUnicosmk_RestrictMachs[] = {
-        "*-*-unicosmk*",
+tSCC* apzVms_Define_Can_Use_Extern_PrefixMachs[] = {
+        "*-*-*vms*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zUnicosmk_RestrictSelect0[] =
-       "(\\*[ \t]*)restrict([ \t]+)";
+tSCC zVms_Define_Can_Use_Extern_PrefixSelect0[] =
+       "#[ \t]*else\n\
+#[ \t]*if defined\\(__DECCXX\\)\n\
+#[ \t]*define __CAN_USE_EXTERN_PREFIX 1\n";
 
-#define    UNICOSMK_RESTRICT_TEST_CT  1
-static tTestDesc aUnicosmk_RestrictTests[] = {
-  { TT_EGREP,    zUnicosmk_RestrictSelect0, (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 Unicosmk_Restrict
+ *  Fix Command Arguments for Vms_Define_Can_Use_Extern_Prefix
  */
-static const char* apzUnicosmk_RestrictPatch[] = {
+static const char* apzVms_Define_Can_Use_Extern_PrefixPatch[] = {
     "format",
-    "%1__restrict__%2",
+    "%0#    elif defined (__GNUC__)\n\
+#\tdefine __CAN_USE_EXTERN_PREFIX 1\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Uw7_Byteorder_Fix fix
+ *  Description of Vms_Use_Pragma_Extern_Model fix
  */
-tSCC zUw7_Byteorder_FixName[] =
-     "uw7_byteorder_fix";
+tSCC zVms_Use_Pragma_Extern_ModelName[] =
+     "vms_use_pragma_extern_model";
 
 /*
  *  File name selection pattern
  */
-tSCC zUw7_Byteorder_FixList[] =
-  "arpa/inet.h\0";
+#define zVms_Use_Pragma_Extern_ModelList (char*)NULL
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzUw7_Byteorder_FixMachs[] = {
-        "*-*-sysv4*",
-        "i?86-*-sysv5*",
-        "i?86-*-udk*",
-        "i?86-*-solaris2.[0-4]",
-        "powerpcle-*-solaris2.[0-4]",
-        "sparc-*-solaris2.[0-4]",
+tSCC* apzVms_Use_Pragma_Extern_ModelMachs[] = {
+        "*-*-*vms*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zUw7_Byteorder_FixSelect0[] =
-       "in_port_t";
-
-/*
- *  perform the 'test' shell command - do fix on success
- */
-tSCC zUw7_Byteorder_FixTest0[] =
-       "-f sys/byteorder.h";
+tSCC zVms_Use_Pragma_Extern_ModelSelect0[] =
+       "#if defined\\(__DECC\\) \\|\\| defined\\(__DECCXX\\)\n\
+# pragma extern_model __save\n";
 
-#define    UW7_BYTEORDER_FIX_TEST_CT  2
-static tTestDesc aUw7_Byteorder_FixTests[] = {
-  { TT_TEST,     zUw7_Byteorder_FixTest0,   0 /* unused */ },
-  { TT_EGREP,    zUw7_Byteorder_FixSelect0, (regex_t*)NULL }, };
+#define    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 Uw7_Byteorder_Fix
+ *  Fix Command Arguments for Vms_Use_Pragma_Extern_Model
  */
-static const char* apzUw7_Byteorder_FixPatch[] = {
+static const char* apzVms_Use_Pragma_Extern_ModelPatch[] = {
     "format",
-    "",
-    "^extern.*[ \t](htons|ntohs).*\\(in_port_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_Disable_Decc_String_Builtins fix
  */
-tSCC zVa_I960_MacroName[] =
-     "va_i960_macro";
+tSCC zVms_Disable_Decc_String_BuiltinsName[] =
+     "vms_disable_decc_string_builtins";
 
 /*
  *  File name selection pattern
  */
-tSCC zVa_I960_MacroList[] =
-  "arch/i960/archI960.h\0";
+tSCC zVms_Disable_Decc_String_BuiltinsList[] =
+  "rtldef/string.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzVa_I960_MacroMachs (const char**)NULL
+tSCC* apzVms_Disable_Decc_String_BuiltinsMachs[] = {
+        "*-*-*vms*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zVa_I960_MacroSelect0[] =
-       "__(vsiz|vali|vpad|alignof__)";
+tSCC zVms_Disable_Decc_String_BuiltinsSelect0[] =
+       "#if !defined\\(__VAX\\)\n";
 
-#define    VA_I960_MACRO_TEST_CT  1
-static tTestDesc aVa_I960_MacroTests[] = {
-  { TT_EGREP,    zVa_I960_MacroSelect0, (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 Va_I960_Macro
+ *  Fix Command Arguments for Vms_Disable_Decc_String_Builtins
  */
-static const char* apzVa_I960_MacroPatch[] = {
+static const char* apzVms_Disable_Decc_String_BuiltinsPatch[] = {
     "format",
-    "__vx%1",
+    "#if !defined(__VAX) && !defined(__GNUC__)\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -8154,10 +8737,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 }, };
 
 /*
@@ -8198,7 +8784,7 @@ static tTestDesc aVxworks_Gcc_ProblemTests[] = {
 /*
  *  Fix Command Arguments for Vxworks_Gcc_Problem
  */
-static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
+static const char* apzVxworks_Gcc_ProblemPatch[] = { sed_cmd_z,
     "-e", "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/",
     "-e", "/[ \t]size_t/i\\\n\
 #ifndef _GCC_SIZE_T\\\n\
@@ -8295,7 +8881,7 @@ static tTestDesc aVxworks_Needs_VxworksTests[] = {
 /*
  *  Fix Command Arguments for Vxworks_Needs_Vxworks
  */
-static const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
+static const char* apzVxworks_Needs_VxworksPatch[] = { sed_cmd_z,
     "-e", "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n\
 #include <types/vxTypesOld.h>\n",
     (char*)NULL };
@@ -8352,97 +8938,6 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Windiss_Math1 fix
- */
-tSCC zWindiss_Math1Name[] =
-     "windiss_math1";
-
-/*
- *  File name selection pattern
- */
-tSCC zWindiss_Math1List[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzWindiss_Math1Machs[] = {
-        "*-*-windiss",
-        (const char*)NULL };
-#define WINDISS_MATH1_TEST_CT  0
-#define aWindiss_Math1Tests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Windiss_Math1
- */
-static const char* apzWindiss_Math1Patch[] = { "sed",
-    "-e", "s|inline long double cosl.*|#ifndef __GNUC__|",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Windiss_Math2 fix
- */
-tSCC zWindiss_Math2Name[] =
-     "windiss_math2";
-
-/*
- *  File name selection pattern
- */
-tSCC zWindiss_Math2List[] =
-  "math.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzWindiss_Math2Machs[] = {
-        "*-*-windiss",
-        (const char*)NULL };
-#define WINDISS_MATH2_TEST_CT  0
-#define aWindiss_Math2Tests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Windiss_Math2
- */
-static const char* apzWindiss_Math2Patch[] = { "sed",
-    "-e", "s|/\\* long double declarations \\*/|#endif /* __GNUC__ */|",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Windiss_Valist fix
- */
-tSCC zWindiss_ValistName[] =
-     "windiss_valist";
-
-/*
- *  File name selection pattern
- */
-#define zWindiss_ValistList (char*)NULL
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzWindiss_ValistMachs[] = {
-        "*-*-windiss",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zWindiss_ValistSelect0[] =
-       "(#include.*)diab/va_list.h";
-
-#define    WINDISS_VALIST_TEST_CT  1
-static tTestDesc aWindiss_ValistTests[] = {
-  { TT_EGREP,    zWindiss_ValistSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Windiss_Valist
- */
-static const char* apzWindiss_ValistPatch[] = { "sed",
-    "-e", "s|diab/va_list.h|stdarg.h|",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of X11_Class fix
  */
 tSCC zX11_ClassName[] =
@@ -8559,10 +9054,10 @@ static tTestDesc aX11_NewTests[] = {
 /*
  *  Fix Command Arguments for X11_New
  */
-static const char* apzX11_NewPatch[] = { "sed",
+static const char* apzX11_NewPatch[] = { sed_cmd_z,
     "-e", "/Widget\told, new;/i\\\n\
 #ifdef __cplusplus\\\n\
-\tWidget\told, c_new;\\\n\
+\\\tWidget\told, c_new;\\\n\
 #else\n",
     "-e", "/Widget\told, new;/a\\\n\
 #endif\n",
@@ -8611,14 +9106,15 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          255
-#define MACH_LIST_SIZE_LIMIT 261
-#define FIX_COUNT            212
+#define REGEX_COUNT          266
+#define MACH_LIST_SIZE_LIMIT 181
+#define FIX_COUNT            224
 
 /*
  *  Enumerate the fixes
  */
 typedef enum {
+    AAB_AIX_STDIO_FIXIDX,
     AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_FIXIDX,
     AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_FIXIDX,
     AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX,
@@ -8626,13 +9122,18 @@ typedef enum {
     AAB_FD_ZERO_SELECTBITS_H_FIXIDX,
     AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
     AAB_SUN_MEMCPY_FIXIDX,
-    AAB_ULTRIX_ANSI_COMPAT_FIXIDX,
-    AAB_ULTRIX_LIMITS_FIXIDX,
-    AAB_ULTRIX_MEMORY_FIXIDX,
-    AAB_ULTRIX_STRING_FIXIDX,
+    AIX_COMPLEX_FIXIDX,
+    AIX_MALLOC_FIXIDX,
+    AIX_NET_IF_ARP_FIXIDX,
+    AIX_ONCE_INIT_1_FIXIDX,
+    AIX_ONCE_INIT_2_FIXIDX,
     AIX_PTHREAD_FIXIDX,
+    AIX_STDINT_1_FIXIDX,
+    AIX_STDINT_2_FIXIDX,
+    AIX_STDINT_3_FIXIDX,
+    AIX_STDINT_4_FIXIDX,
+    AIX_STDINT_5_FIXIDX,
     AIX_SYSMACHINE_FIXIDX,
-    AIX_SYSWAIT_FIXIDX,
     AIX_SYSWAIT_2_FIXIDX,
     AIX_VOLATILE_FIXIDX,
     ALPHA___ASSERT_FIXIDX,
@@ -8642,12 +9143,12 @@ typedef enum {
     ALPHA_ASSERT_FIXIDX,
     ALPHA_BAD_LVAL_FIXIDX,
     ALPHA_GETOPT_FIXIDX,
+    ALPHA_IF_SEMICOLON_FIXIDX,
     ALPHA_PARENS_FIXIDX,
     ALPHA_PTHREAD_FIXIDX,
     ALPHA_PTHREAD_GCC_FIXIDX,
     ALPHA_PTHREAD_INIT_FIXIDX,
     ALPHA_SBRK_FIXIDX,
-    ALPHA_WCHAR_FIXIDX,
     AVOID_BOOL_DEFINE_FIXIDX,
     AVOID_BOOL_TYPE_FIXIDX,
     AVOID_WCHAR_T_TYPE_FIXIDX,
@@ -8658,16 +9159,23 @@ typedef enum {
     BROKEN_CABS_FIXIDX,
     BROKEN_NAN_FIXIDX,
     BSD_STDIO_ATTRS_CONFLICT_FIXIDX,
+    CDEF_CPLUSPLUS_FIXIDX,
     CTRL_QUOTES_DEF_FIXIDX,
     CTRL_QUOTES_USE_FIXIDX,
     CXX_UNREADY_FIXIDX,
     DARWIN_EXTERNC_FIXIDX,
     DARWIN_GCC4_BREAKAGE_FIXIDX,
     DARWIN_PRIVATE_EXTERN_FIXIDX,
+    DARWIN_STDINT_1_FIXIDX,
+    DARWIN_STDINT_2_FIXIDX,
+    DARWIN_STDINT_3_FIXIDX,
+    DARWIN_STDINT_4_FIXIDX,
+    DARWIN_STDINT_5_FIXIDX,
+    DARWIN_STDINT_6_FIXIDX,
+    DARWIN_STDINT_7_FIXIDX,
     DEC_INTERN_ASM_FIXIDX,
     DJGPP_WCHAR_H_FIXIDX,
     ECD_CURSOR_FIXIDX,
-    EXCEPTION_STRUCTURE_FIXIDX,
     FREEBSD_GCC3_BREAKAGE_FIXIDX,
     FREEBSD_GCC4_BREAKAGE_FIXIDX,
     GLIBC_C99_INLINE_1_FIXIDX,
@@ -8676,32 +9184,41 @@ typedef enum {
     GLIBC_C99_INLINE_3_FIXIDX,
     GLIBC_C99_INLINE_4_FIXIDX,
     GLIBC_MUTEX_INIT_FIXIDX,
+    GLIBC_STDINT_FIXIDX,
+    GLIBC_STRNCPY_FIXIDX,
+    GLIBC_TGMATH_FIXIDX,
     GNU_TYPES_FIXIDX,
     HP_INLINE_FIXIDX,
     HP_SYSFILE_FIXIDX,
+    HPPA_HPUX_FP_MACROS_FIXIDX,
     HPUX10_CPP_POW_INLINE_FIXIDX,
     HPUX11_CPP_POW_INLINE_FIXIDX,
-    HPPA_HPUX_FP_MACROS_FIXIDX,
     HPUX10_CTYPE_DECLARATIONS1_FIXIDX,
     HPUX10_CTYPE_DECLARATIONS2_FIXIDX,
     HPUX10_STDIO_DECLARATIONS_FIXIDX,
     HPUX11_ABS_FIXIDX,
     HPUX11_FABSF_FIXIDX,
+    HPUX11_PTHREAD_CONST_FIXIDX,
     HPUX11_SIZE_T_FIXIDX,
     HPUX11_SNPRINTF_FIXIDX,
-    HPUX11_UINT32_C_FIXIDX,
     HPUX11_VSNPRINTF_FIXIDX,
     HPUX8_BOGUS_INLINES_FIXIDX,
     HPUX_CTYPE_MACROS_FIXIDX,
     HPUX_HTONL_FIXIDX,
     HPUX_LONG_DOUBLE_FIXIDX,
+    HPUX_LONG_DOUBLE_2_FIXIDX,
     HPUX_SYSTIME_FIXIDX,
     HPUX_SPU_INFO_FIXIDX,
     HPUX11_EXTERN_SENDFILE_FIXIDX,
     HPUX11_EXTERN_SENDPATH_FIXIDX,
     HPUX_EXTERN_ERRNO_FIXIDX,
-    HPUX11_PTHREAD_CONST_FIXIDX,
     HPUX_PTHREAD_INITIALIZERS_FIXIDX,
+    HPUX_C99_INTPTR_FIXIDX,
+    HPUX_C99_INTTYPES_FIXIDX,
+    HPUX_C99_INTTYPES2_FIXIDX,
+    HPUX_STDINT_LEAST_FAST_FIXIDX,
+    HPUX_INTTYPE_INT8_T_FIXIDX,
+    HPUX_IMAGINARY_I_FIXIDX,
     HUGE_VAL_HEX_FIXIDX,
     HUGE_VALF_HEX_FIXIDX,
     HUGE_VALL_HEX_FIXIDX,
@@ -8713,16 +9230,16 @@ typedef enum {
     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_FIXIDX,
+    IRIX_STDINT_C99_MODE_FIXIDX,
+    IRIX_STDINT_C99_TYPES_FIXIDX,
+    IRIX_STDINT_C99_MACROS_FIXIDX,
     IRIX_STDIO_VA_LIST_FIXIDX,
     IRIX_WCSFTIME_FIXIDX,
-    ISC_FMOD_FIXIDX,
-    ISC_OMITS_WITH_STDC_FIXIDX,
     KANDR_CONCAT_FIXIDX,
-    LIBC1_G_VA_LIST_FIXIDX,
-    LIBC1_IFDEFD_MEMX_FIXIDX,
     LINUX_IA64_UCONTEXT_FIXIDX,
     LYNXOS_NO_WARNING_IN_SYS_TIME_H_FIXIDX,
     LYNXOS_MISSING_PUTENV_FIXIDX,
@@ -8731,20 +9248,21 @@ typedef enum {
     MATH_EXCEPTION_FIXIDX,
     MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX,
     NESTED_AUTH_DES_FIXIDX,
-    NESTED_MOTOROLA_FIXIDX,
-    NESTED_SYS_LIMITS_FIXIDX,
     NETBSD_C99_INLINE_1_FIXIDX,
     NETBSD_C99_INLINE_2_FIXIDX,
     NETBSD_EXTRA_SEMICOLON_FIXIDX,
+    NEWLIB_STDINT_1_FIXIDX,
+    NEWLIB_STDINT_2_FIXIDX,
     NEXT_MATH_PREFIX_FIXIDX,
     NEXT_TEMPLATE_FIXIDX,
     NEXT_VOLITILE_FIXIDX,
     NEXT_WAIT_UNION_FIXIDX,
     NODEENT_SYNTAX_FIXIDX,
+    OPENBSD_NULL_DEFINITION_FIXIDX,
     OBSTACK_LVALUE_CAST_FIXIDX,
+    OPENBSD_VA_START_FIXIDX,
     OSF_NAMESPACE_A_FIXIDX,
     OSF_NAMESPACE_C_FIXIDX,
-    PTHREAD_PAGE_SIZE_FIXIDX,
     PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_FIXIDX,
     READ_RET_TYPE_FIXIDX,
     RPC_XDR_LVALUE_CAST_A_FIXIDX,
@@ -8752,10 +9270,13 @@ typedef enum {
     RS6000_DOUBLE_FIXIDX,
     RS6000_FCHMOD_FIXIDX,
     RS6000_PARAM_FIXIDX,
-    SCO_MATH_FIXIDX,
-    SCO_REGSET_FIXIDX,
-    SCO_STATIC_FUNC_FIXIDX,
-    SCO_UTIME_FIXIDX,
+    SOLARIS___RESTRICT_FIXIDX,
+    SOLARIS_COMPLEX_FIXIDX,
+    SOLARIS_COMPLEX_CXX_FIXIDX,
+    SOLARIS_COND_INIT_FIXIDX,
+    SOLARIS_CXX_LINKAGE_FIXIDX,
+    SOLARIS_GETC_STRICT_STDC_FIXIDX,
+    SOLARIS_LONGJMP_NORETURN_FIXIDX,
     SOLARIS_MATH_1_FIXIDX,
     SOLARIS_MATH_2_FIXIDX,
     SOLARIS_MATH_3_FIXIDX,
@@ -8763,15 +9284,20 @@ typedef enum {
     SOLARIS_MATH_8_FIXIDX,
     SOLARIS_MATH_9_FIXIDX,
     SOLARIS_MATH_10_FIXIDX,
-    SOLARIS_MUTEX_INIT_1_FIXIDX,
     SOLARIS_MUTEX_INIT_2_FIXIDX,
+    SOLARIS_POW_INT_OVERLOAD_FIXIDX,
     SOLARIS_RWLOCK_INIT_1_FIXIDX,
     SOLARIS_ONCE_INIT_1_FIXIDX,
     SOLARIS_ONCE_INIT_2_FIXIDX,
-    SOLARIS_SOCKET_FIXIDX,
+    SOLARIS_INT_CONST_FIXIDX,
+    SOLARIS_INT_LIMITS_1_FIXIDX,
+    SOLARIS_INT_LIMITS_2_FIXIDX,
+    SOLARIS_INT_LIMITS_3_FIXIDX,
+    SOLARIS_INT_TYPES_FIXIDX,
+    SOLARIS_POSIX_SPAWN_RESTRICT_FIXIDX,
+    SOLARIS_STD___FILBUF_FIXIDX,
     SOLARIS_STDIO_TAG_FIXIDX,
-    SOLARIS_UNISTD_FIXIDX,
-    SOLARIS_WIDEC_FIXIDX,
+    SOLARIS_SYS_VA_LIST_FIXIDX,
     STATSSWTCH_FIXIDX,
     STDIO_STDARG_H_FIXIDX,
     STDIO_VA_LIST_FIXIDX,
@@ -8790,7 +9316,6 @@ typedef enum {
     SUNOS_STRLEN_FIXIDX,
     SVR4_DISABLE_OPT_FIXIDX,
     SVR4_GETCWD_FIXIDX,
-    SVR4_KRNL_FIXIDX,
     SVR4_PROFIL_FIXIDX,
     SVR4_SIGHANDLER_TYPE_FIXIDX,
     SVR4_UNDECLARED_GETRNGE_FIXIDX,
@@ -8798,35 +9323,17 @@ typedef enum {
     SYSZ_STDLIB_FOR_SUN_FIXIDX,
     THREAD_KEYWORD_FIXIDX,
     TINFO_CPLUSPLUS_FIXIDX,
-    ULTRIX_ATEXIT_PARAM_FIXIDX,
-    ULTRIX_ATOF_PARAM_FIXIDX,
     ULTRIX_CONST_FIXIDX,
     ULTRIX_CONST2_FIXIDX,
-    ULTRIX_CONST3_FIXIDX,
-    ULTRIX_FIX_FIXPROTO_FIXIDX,
-    ULTRIX_IFDEF_FIXIDX,
-    ULTRIX_LOCALE_FIXIDX,
-    ULTRIX_MATH_IFDEF_FIXIDX,
-    ULTRIX_NESTED_IOCTL_FIXIDX,
-    ULTRIX_NESTED_SVC_FIXIDX,
-    ULTRIX_STAT_FIXIDX,
-    ULTRIX_STATIC_FIXIDX,
-    ULTRIX_STDLIB_FIXIDX,
-    ULTRIX_STRINGS_FIXIDX,
-    ULTRIX_STRINGS2_FIXIDX,
-    ULTRIX_SYS_TIME_FIXIDX,
-    ULTRIX_UNISTD_FIXIDX,
-    UNICOSMK_RESTRICT_FIXIDX,
-    UW7_BYTEORDER_FIX_FIXIDX,
     VA_I960_MACRO_FIXIDX,
+    VMS_DEFINE_CAN_USE_EXTERN_PREFIX_FIXIDX,
+    VMS_USE_PRAGMA_EXTERN_MODEL_FIXIDX,
+    VMS_DISABLE_DECC_STRING_BUILTINS_FIXIDX,
     VOID_NULL_FIXIDX,
     VXWORKS_GCC_PROBLEM_FIXIDX,
     VXWORKS_NEEDS_VXTYPES_FIXIDX,
     VXWORKS_NEEDS_VXWORKS_FIXIDX,
     VXWORKS_TIME_FIXIDX,
-    WINDISS_MATH1_FIXIDX,
-    WINDISS_MATH2_FIXIDX,
-    WINDISS_VALIST_FIXIDX,
     X11_CLASS_FIXIDX,
     X11_CLASS_USAGE_FIXIDX,
     X11_NEW_FIXIDX,
@@ -8834,6 +9341,11 @@ typedef enum {
 } t_fixinc_idx;
 
 tFixDesc fixDescList[ FIX_COUNT ] = {
+  {  zAab_Aix_StdioName,    zAab_Aix_StdioList,
+     apzAab_Aix_StdioMachs,
+     AAB_AIX_STDIO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAab_Aix_StdioTests,   apzAab_Aix_StdioPatch, 0 },
+
   {  zAab_Darwin7_9_Long_Double_FuncsName,    zAab_Darwin7_9_Long_Double_FuncsList,
      apzAab_Darwin7_9_Long_Double_FuncsMachs,
      AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
@@ -8869,41 +9381,66 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
      aAab_Sun_MemcpyTests,   apzAab_Sun_MemcpyPatch, 0 },
 
-  {  zAab_Ultrix_Ansi_CompatName,    zAab_Ultrix_Ansi_CompatList,
-     apzAab_Ultrix_Ansi_CompatMachs,
-     AAB_ULTRIX_ANSI_COMPAT_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Ultrix_Ansi_CompatTests,   apzAab_Ultrix_Ansi_CompatPatch, 0 },
+  {  zAix_ComplexName,    zAix_ComplexList,
+     apzAix_ComplexMachs,
+     AIX_COMPLEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_ComplexTests,   apzAix_ComplexPatch, 0 },
 
-  {  zAab_Ultrix_LimitsName,    zAab_Ultrix_LimitsList,
-     apzAab_Ultrix_LimitsMachs,
-     AAB_ULTRIX_LIMITS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Ultrix_LimitsTests,   apzAab_Ultrix_LimitsPatch, 0 },
+  {  zAix_MallocName,    zAix_MallocList,
+     apzAix_MallocMachs,
+     AIX_MALLOC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_MallocTests,   apzAix_MallocPatch, 0 },
 
-  {  zAab_Ultrix_MemoryName,    zAab_Ultrix_MemoryList,
-     apzAab_Ultrix_MemoryMachs,
-     AAB_ULTRIX_MEMORY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Ultrix_MemoryTests,   apzAab_Ultrix_MemoryPatch, 0 },
+  {  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 },
 
-  {  zAab_Ultrix_StringName,    zAab_Ultrix_StringList,
-     apzAab_Ultrix_StringMachs,
-     AAB_ULTRIX_STRING_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Ultrix_StringTests,   apzAab_Ultrix_StringPatch, 0 },
+  {  zAix_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_PthreadName,    zAix_PthreadList,
      apzAix_PthreadMachs,
      AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAix_PthreadTests,   apzAix_PthreadPatch, 0 },
 
+  {  zAix_Stdint_1Name,    zAix_Stdint_1List,
+     apzAix_Stdint_1Machs,
+     AIX_STDINT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_1Tests,   apzAix_Stdint_1Patch, 0 },
+
+  {  zAix_Stdint_2Name,    zAix_Stdint_2List,
+     apzAix_Stdint_2Machs,
+     AIX_STDINT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_2Tests,   apzAix_Stdint_2Patch, 0 },
+
+  {  zAix_Stdint_3Name,    zAix_Stdint_3List,
+     apzAix_Stdint_3Machs,
+     AIX_STDINT_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_3Tests,   apzAix_Stdint_3Patch, 0 },
+
+  {  zAix_Stdint_4Name,    zAix_Stdint_4List,
+     apzAix_Stdint_4Machs,
+     AIX_STDINT_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_4Tests,   apzAix_Stdint_4Patch, 0 },
+
+  {  zAix_Stdint_5Name,    zAix_Stdint_5List,
+     apzAix_Stdint_5Machs,
+     AIX_STDINT_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_5Tests,   apzAix_Stdint_5Patch, 0 },
+
   {  zAix_SysmachineName,    zAix_SysmachineList,
      apzAix_SysmachineMachs,
      AIX_SYSMACHINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAix_SysmachineTests,   apzAix_SysmachinePatch, 0 },
 
-  {  zAix_SyswaitName,    zAix_SyswaitList,
-     apzAix_SyswaitMachs,
-     AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAix_SyswaitTests,   apzAix_SyswaitPatch, 0 },
-
   {  zAix_Syswait_2Name,    zAix_Syswait_2List,
      apzAix_Syswait_2Machs,
      AIX_SYSWAIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -8949,6 +9486,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ALPHA_GETOPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAlpha_GetoptTests,   apzAlpha_GetoptPatch, 0 },
 
+  {  zAlpha_If_SemicolonName,    zAlpha_If_SemicolonList,
+     apzAlpha_If_SemicolonMachs,
+     ALPHA_IF_SEMICOLON_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAlpha_If_SemicolonTests,   apzAlpha_If_SemicolonPatch, 0 },
+
   {  zAlpha_ParensName,    zAlpha_ParensList,
      apzAlpha_ParensMachs,
      ALPHA_PARENS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -8974,11 +9516,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAlpha_SbrkTests,   apzAlpha_SbrkPatch, 0 },
 
-  {  zAlpha_WcharName,    zAlpha_WcharList,
-     apzAlpha_WcharMachs,
-     ALPHA_WCHAR_TEST_CT, FD_MACH_ONLY,
-     aAlpha_WcharTests,   apzAlpha_WcharPatch, 0 },
-
   {  zAvoid_Bool_DefineName,    zAvoid_Bool_DefineList,
      apzAvoid_Bool_DefineMachs,
      AVOID_BOOL_DEFINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9029,6 +9566,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      BSD_STDIO_ATTRS_CONFLICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aBsd_Stdio_Attrs_ConflictTests,   apzBsd_Stdio_Attrs_ConflictPatch, 0 },
 
+  {  zCdef_CplusplusName,    zCdef_CplusplusList,
+     apzCdef_CplusplusMachs,
+     CDEF_CPLUSPLUS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aCdef_CplusplusTests,   apzCdef_CplusplusPatch, 0 },
+
   {  zCtrl_Quotes_DefName,    zCtrl_Quotes_DefList,
      apzCtrl_Quotes_DefMachs,
      CTRL_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9059,6 +9601,41 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      DARWIN_PRIVATE_EXTERN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aDarwin_Private_ExternTests,   apzDarwin_Private_ExternPatch, 0 },
 
+  {  zDarwin_Stdint_1Name,    zDarwin_Stdint_1List,
+     apzDarwin_Stdint_1Machs,
+     DARWIN_STDINT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Stdint_1Tests,   apzDarwin_Stdint_1Patch, 0 },
+
+  {  zDarwin_Stdint_2Name,    zDarwin_Stdint_2List,
+     apzDarwin_Stdint_2Machs,
+     DARWIN_STDINT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Stdint_2Tests,   apzDarwin_Stdint_2Patch, 0 },
+
+  {  zDarwin_Stdint_3Name,    zDarwin_Stdint_3List,
+     apzDarwin_Stdint_3Machs,
+     DARWIN_STDINT_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Stdint_3Tests,   apzDarwin_Stdint_3Patch, 0 },
+
+  {  zDarwin_Stdint_4Name,    zDarwin_Stdint_4List,
+     apzDarwin_Stdint_4Machs,
+     DARWIN_STDINT_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Stdint_4Tests,   apzDarwin_Stdint_4Patch, 0 },
+
+  {  zDarwin_Stdint_5Name,    zDarwin_Stdint_5List,
+     apzDarwin_Stdint_5Machs,
+     DARWIN_STDINT_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Stdint_5Tests,   apzDarwin_Stdint_5Patch, 0 },
+
+  {  zDarwin_Stdint_6Name,    zDarwin_Stdint_6List,
+     apzDarwin_Stdint_6Machs,
+     DARWIN_STDINT_6_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Stdint_6Tests,   apzDarwin_Stdint_6Patch, 0 },
+
+  {  zDarwin_Stdint_7Name,    zDarwin_Stdint_7List,
+     apzDarwin_Stdint_7Machs,
+     DARWIN_STDINT_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Stdint_7Tests,   apzDarwin_Stdint_7Patch, 0 },
+
   {  zDec_Intern_AsmName,    zDec_Intern_AsmList,
      apzDec_Intern_AsmMachs,
      DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
@@ -9074,11 +9651,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ECD_CURSOR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aEcd_CursorTests,   apzEcd_CursorPatch, 0 },
 
-  {  zException_StructureName,    zException_StructureList,
-     apzException_StructureMachs,
-     EXCEPTION_STRUCTURE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aException_StructureTests,   apzException_StructurePatch, 0 },
-
   {  zFreebsd_Gcc3_BreakageName,    zFreebsd_Gcc3_BreakageList,
      apzFreebsd_Gcc3_BreakageMachs,
      FREEBSD_GCC3_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9119,6 +9691,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      GLIBC_MUTEX_INIT_TEST_CT, FD_MACH_ONLY,
      aGlibc_Mutex_InitTests,   apzGlibc_Mutex_InitPatch, 0 },
 
+  {  zGlibc_StdintName,    zGlibc_StdintList,
+     apzGlibc_StdintMachs,
+     GLIBC_STDINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aGlibc_StdintTests,   apzGlibc_StdintPatch, 0 },
+
+  {  zGlibc_StrncpyName,    zGlibc_StrncpyList,
+     apzGlibc_StrncpyMachs,
+     GLIBC_STRNCPY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aGlibc_StrncpyTests,   apzGlibc_StrncpyPatch, 0 },
+
+  {  zGlibc_TgmathName,    zGlibc_TgmathList,
+     apzGlibc_TgmathMachs,
+     GLIBC_TGMATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aGlibc_TgmathTests,   apzGlibc_TgmathPatch, 0 },
+
   {  zGnu_TypesName,    zGnu_TypesList,
      apzGnu_TypesMachs,
      GNU_TYPES_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE,
@@ -9134,6 +9721,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HP_SYSFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHp_SysfileTests,   apzHp_SysfilePatch, 0 },
 
+  {  zHppa_Hpux_Fp_MacrosName,    zHppa_Hpux_Fp_MacrosList,
+     apzHppa_Hpux_Fp_MacrosMachs,
+     HPPA_HPUX_FP_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHppa_Hpux_Fp_MacrosTests,   apzHppa_Hpux_Fp_MacrosPatch, 0 },
+
   {  zHpux10_Cpp_Pow_InlineName,    zHpux10_Cpp_Pow_InlineList,
      apzHpux10_Cpp_Pow_InlineMachs,
      HPUX10_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9144,11 +9736,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX11_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_Cpp_Pow_InlineTests,   apzHpux11_Cpp_Pow_InlinePatch, 0 },
 
-  {  zHppa_Hpux_Fp_MacrosName,    zHppa_Hpux_Fp_MacrosList,
-     apzHppa_Hpux_Fp_MacrosMachs,
-     HPPA_HPUX_FP_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHppa_Hpux_Fp_MacrosTests,   apzHppa_Hpux_Fp_MacrosPatch, 0 },
-
   {  zHpux10_Ctype_Declarations1Name,    zHpux10_Ctype_Declarations1List,
      apzHpux10_Ctype_Declarations1Machs,
      HPUX10_CTYPE_DECLARATIONS1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9174,6 +9761,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_FabsfTests,   apzHpux11_FabsfPatch, 0 },
 
+  {  zHpux11_Pthread_ConstName,    zHpux11_Pthread_ConstList,
+     apzHpux11_Pthread_ConstMachs,
+     HPUX11_PTHREAD_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_Pthread_ConstTests,   apzHpux11_Pthread_ConstPatch, 0 },
+
   {  zHpux11_Size_TName,    zHpux11_Size_TList,
      apzHpux11_Size_TMachs,
      HPUX11_SIZE_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9184,11 +9776,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX11_SNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_SnprintfTests,   apzHpux11_SnprintfPatch, 0 },
 
-  {  zHpux11_Uint32_CName,    zHpux11_Uint32_CList,
-     apzHpux11_Uint32_CMachs,
-     HPUX11_UINT32_C_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_Uint32_CTests,   apzHpux11_Uint32_CPatch, 0 },
-
   {  zHpux11_VsnprintfName,    zHpux11_VsnprintfList,
      apzHpux11_VsnprintfMachs,
      HPUX11_VSNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9214,6 +9801,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY,
      aHpux_Long_DoubleTests,   apzHpux_Long_DoublePatch, 0 },
 
+  {  zHpux_Long_Double_2Name,    zHpux_Long_Double_2List,
+     apzHpux_Long_Double_2Machs,
+     HPUX_LONG_DOUBLE_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Long_Double_2Tests,   apzHpux_Long_Double_2Patch, 0 },
+
   {  zHpux_SystimeName,    zHpux_SystimeList,
      apzHpux_SystimeMachs,
      HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9239,16 +9831,41 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX_EXTERN_ERRNO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux_Extern_ErrnoTests,   apzHpux_Extern_ErrnoPatch, 0 },
 
-  {  zHpux11_Pthread_ConstName,    zHpux11_Pthread_ConstList,
-     apzHpux11_Pthread_ConstMachs,
-     HPUX11_PTHREAD_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux11_Pthread_ConstTests,   apzHpux11_Pthread_ConstPatch, 0 },
-
   {  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_Stdint_Least_FastName,    zHpux_Stdint_Least_FastList,
+     apzHpux_Stdint_Least_FastMachs,
+     HPUX_STDINT_LEAST_FAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Stdint_Least_FastTests,   apzHpux_Stdint_Least_FastPatch, 0 },
+
+  {  zHpux_Inttype_Int8_TName,    zHpux_Inttype_Int8_TList,
+     apzHpux_Inttype_Int8_TMachs,
+     HPUX_INTTYPE_INT8_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Inttype_Int8_TTests,   apzHpux_Inttype_Int8_TPatch, 0 },
+
+  {  zHpux_Imaginary_IName,    zHpux_Imaginary_IList,
+     apzHpux_Imaginary_IMachs,
+     HPUX_IMAGINARY_I_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Imaginary_ITests,   apzHpux_Imaginary_IPatch, 0 },
+
   {  zHuge_Val_HexName,    zHuge_Val_HexList,
      apzHuge_Val_HexMachs,
      HUGE_VAL_HEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9304,20 +9921,40 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIrix_Asm_ApostropheTests,   apzIrix_Asm_ApostrophePatch, 0 },
 
+  {  zIrix_ComplexName,    zIrix_ComplexList,
+     apzIrix_ComplexMachs,
+     IRIX_COMPLEX_TEST_CT, FD_MACH_ONLY,
+     aIrix_ComplexTests,   apzIrix_ComplexPatch, 0 },
+
   {  zIrix_Limits_ConstName,    zIrix_Limits_ConstList,
      apzIrix_Limits_ConstMachs,
      IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      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_C99Name,    zIrix_Stdint_C99List,
-     apzIrix_Stdint_C99Machs,
-     IRIX_STDINT_C99_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix_Stdint_C99Tests,   apzIrix_Stdint_C99Patch, 0 },
+  {  zIrix_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,
@@ -9329,31 +9966,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      IRIX_WCSFTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIrix_WcsftimeTests,   apzIrix_WcsftimePatch, 0 },
 
-  {  zIsc_FmodName,    zIsc_FmodList,
-     apzIsc_FmodMachs,
-     ISC_FMOD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIsc_FmodTests,   apzIsc_FmodPatch, 0 },
-
-  {  zIsc_Omits_With_StdcName,    zIsc_Omits_With_StdcList,
-     apzIsc_Omits_With_StdcMachs,
-     ISC_OMITS_WITH_STDC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIsc_Omits_With_StdcTests,   apzIsc_Omits_With_StdcPatch, 0 },
-
   {  zKandr_ConcatName,    zKandr_ConcatList,
      apzKandr_ConcatMachs,
      KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aKandr_ConcatTests,   apzKandr_ConcatPatch, 0 },
 
-  {  zLibc1_G_Va_ListName,    zLibc1_G_Va_ListList,
-     apzLibc1_G_Va_ListMachs,
-     LIBC1_G_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aLibc1_G_Va_ListTests,   apzLibc1_G_Va_ListPatch, 0 },
-
-  {  zLibc1_Ifdefd_MemxName,    zLibc1_Ifdefd_MemxList,
-     apzLibc1_Ifdefd_MemxMachs,
-     LIBC1_IFDEFD_MEMX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aLibc1_Ifdefd_MemxTests,   apzLibc1_Ifdefd_MemxPatch, 0 },
-
   {  zLinux_Ia64_UcontextName,    zLinux_Ia64_UcontextList,
      apzLinux_Ia64_UcontextMachs,
      LINUX_IA64_UCONTEXT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9394,16 +10011,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aNested_Auth_DesTests,   apzNested_Auth_DesPatch, 0 },
 
-  {  zNested_MotorolaName,    zNested_MotorolaList,
-     apzNested_MotorolaMachs,
-     NESTED_MOTOROLA_TEST_CT, FD_MACH_ONLY,
-     aNested_MotorolaTests,   apzNested_MotorolaPatch, 0 },
-
-  {  zNested_Sys_LimitsName,    zNested_Sys_LimitsList,
-     apzNested_Sys_LimitsMachs,
-     NESTED_SYS_LIMITS_TEST_CT, FD_MACH_ONLY,
-     aNested_Sys_LimitsTests,   apzNested_Sys_LimitsPatch, 0 },
-
   {  zNetbsd_C99_Inline_1Name,    zNetbsd_C99_Inline_1List,
      apzNetbsd_C99_Inline_1Machs,
      NETBSD_C99_INLINE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9419,6 +10026,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      NETBSD_EXTRA_SEMICOLON_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aNetbsd_Extra_SemicolonTests,   apzNetbsd_Extra_SemicolonPatch, 0 },
 
+  {  zNewlib_Stdint_1Name,    zNewlib_Stdint_1List,
+     apzNewlib_Stdint_1Machs,
+     NEWLIB_STDINT_1_TEST_CT, FD_MACH_ONLY,
+     aNewlib_Stdint_1Tests,   apzNewlib_Stdint_1Patch, 0 },
+
+  {  zNewlib_Stdint_2Name,    zNewlib_Stdint_2List,
+     apzNewlib_Stdint_2Machs,
+     NEWLIB_STDINT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aNewlib_Stdint_2Tests,   apzNewlib_Stdint_2Patch, 0 },
+
   {  zNext_Math_PrefixName,    zNext_Math_PrefixList,
      apzNext_Math_PrefixMachs,
      NEXT_MATH_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9444,11 +10061,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      NODEENT_SYNTAX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aNodeent_SyntaxTests,   apzNodeent_SyntaxPatch, 0 },
 
+  {  zOpenbsd_Null_DefinitionName,    zOpenbsd_Null_DefinitionList,
+     apzOpenbsd_Null_DefinitionMachs,
+     OPENBSD_NULL_DEFINITION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aOpenbsd_Null_DefinitionTests,   apzOpenbsd_Null_DefinitionPatch, 0 },
+
   {  zObstack_Lvalue_CastName,    zObstack_Lvalue_CastList,
      apzObstack_Lvalue_CastMachs,
      OBSTACK_LVALUE_CAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aObstack_Lvalue_CastTests,   apzObstack_Lvalue_CastPatch, 0 },
 
+  {  zOpenbsd_Va_StartName,    zOpenbsd_Va_StartList,
+     apzOpenbsd_Va_StartMachs,
+     OPENBSD_VA_START_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aOpenbsd_Va_StartTests,   apzOpenbsd_Va_StartPatch, 0 },
+
   {  zOsf_Namespace_AName,    zOsf_Namespace_AList,
      apzOsf_Namespace_AMachs,
      OSF_NAMESPACE_A_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9459,11 +10086,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      OSF_NAMESPACE_C_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aOsf_Namespace_CTests,   apzOsf_Namespace_CPatch, 0 },
 
-  {  zPthread_Page_SizeName,    zPthread_Page_SizeList,
-     apzPthread_Page_SizeMachs,
-     PTHREAD_PAGE_SIZE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aPthread_Page_SizeTests,   apzPthread_Page_SizePatch, 0 },
-
   {  zPthread_Incomplete_Struct_ArgumentName,    zPthread_Incomplete_Struct_ArgumentList,
      apzPthread_Incomplete_Struct_ArgumentMachs,
      PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9499,25 +10121,40 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      RS6000_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aRs6000_ParamTests,   apzRs6000_ParamPatch, 0 },
 
-  {  zSco_MathName,    zSco_MathList,
-     apzSco_MathMachs,
-     SCO_MATH_TEST_CT, FD_MACH_ONLY,
-     aSco_MathTests,   apzSco_MathPatch, 0 },
-
-  {  zSco_RegsetName,    zSco_RegsetList,
-     apzSco_RegsetMachs,
-     SCO_REGSET_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSco_RegsetTests,   apzSco_RegsetPatch, 0 },
-
-  {  zSco_Static_FuncName,    zSco_Static_FuncList,
-     apzSco_Static_FuncMachs,
-     SCO_STATIC_FUNC_TEST_CT, FD_MACH_ONLY,
-     aSco_Static_FuncTests,   apzSco_Static_FuncPatch, 0 },
-
-  {  zSco_UtimeName,    zSco_UtimeList,
-     apzSco_UtimeMachs,
-     SCO_UTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSco_UtimeTests,   apzSco_UtimePatch, 0 },
+  {  zSolaris___RestrictName,    zSolaris___RestrictList,
+     apzSolaris___RestrictMachs,
+     SOLARIS___RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris___RestrictTests,   apzSolaris___RestrictPatch, 0 },
+
+  {  zSolaris_ComplexName,    zSolaris_ComplexList,
+     apzSolaris_ComplexMachs,
+     SOLARIS_COMPLEX_TEST_CT, FD_MACH_ONLY,
+     aSolaris_ComplexTests,   apzSolaris_ComplexPatch, 0 },
+
+  {  zSolaris_Complex_CxxName,    zSolaris_Complex_CxxList,
+     apzSolaris_Complex_CxxMachs,
+     SOLARIS_COMPLEX_CXX_TEST_CT, FD_MACH_ONLY,
+     aSolaris_Complex_CxxTests,   apzSolaris_Complex_CxxPatch, 0 },
+
+  {  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_Longjmp_NoreturnName,    zSolaris_Longjmp_NoreturnList,
+     apzSolaris_Longjmp_NoreturnMachs,
+     SOLARIS_LONGJMP_NORETURN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Longjmp_NoreturnTests,   apzSolaris_Longjmp_NoreturnPatch, 0 },
 
   {  zSolaris_Math_1Name,    zSolaris_Math_1List,
      apzSolaris_Math_1Machs,
@@ -9554,16 +10191,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SOLARIS_MATH_10_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSolaris_Math_10Tests,   apzSolaris_Math_10Patch, 0 },
 
-  {  zSolaris_Mutex_Init_1Name,    zSolaris_Mutex_Init_1List,
-     apzSolaris_Mutex_Init_1Machs,
-     SOLARIS_MUTEX_INIT_1_TEST_CT, FD_MACH_ONLY,
-     aSolaris_Mutex_Init_1Tests,   apzSolaris_Mutex_Init_1Patch, 0 },
-
   {  zSolaris_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_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_Rwlock_Init_1Name,    zSolaris_Rwlock_Init_1List,
      apzSolaris_Rwlock_Init_1Machs,
      SOLARIS_RWLOCK_INIT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9579,25 +10216,50 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SOLARIS_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSolaris_Once_Init_2Tests,   apzSolaris_Once_Init_2Patch, 0 },
 
-  {  zSolaris_SocketName,    zSolaris_SocketList,
-     apzSolaris_SocketMachs,
-     SOLARIS_SOCKET_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_SocketTests,   apzSolaris_SocketPatch, 0 },
+  {  zSolaris_Int_ConstName,    zSolaris_Int_ConstList,
+     apzSolaris_Int_ConstMachs,
+     SOLARIS_INT_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Int_ConstTests,   apzSolaris_Int_ConstPatch, 0 },
+
+  {  zSolaris_Int_Limits_1Name,    zSolaris_Int_Limits_1List,
+     apzSolaris_Int_Limits_1Machs,
+     SOLARIS_INT_LIMITS_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Int_Limits_1Tests,   apzSolaris_Int_Limits_1Patch, 0 },
+
+  {  zSolaris_Int_Limits_2Name,    zSolaris_Int_Limits_2List,
+     apzSolaris_Int_Limits_2Machs,
+     SOLARIS_INT_LIMITS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Int_Limits_2Tests,   apzSolaris_Int_Limits_2Patch, 0 },
+
+  {  zSolaris_Int_Limits_3Name,    zSolaris_Int_Limits_3List,
+     apzSolaris_Int_Limits_3Machs,
+     SOLARIS_INT_LIMITS_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Int_Limits_3Tests,   apzSolaris_Int_Limits_3Patch, 0 },
+
+  {  zSolaris_Int_TypesName,    zSolaris_Int_TypesList,
+     apzSolaris_Int_TypesMachs,
+     SOLARIS_INT_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Int_TypesTests,   apzSolaris_Int_TypesPatch, 0 },
+
+  {  zSolaris_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_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_Stdio_TagName,    zSolaris_Stdio_TagList,
      apzSolaris_Stdio_TagMachs,
      SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,
      aSolaris_Stdio_TagTests,   apzSolaris_Stdio_TagPatch, 0 },
 
-  {  zSolaris_UnistdName,    zSolaris_UnistdList,
-     apzSolaris_UnistdMachs,
-     SOLARIS_UNISTD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_UnistdTests,   apzSolaris_UnistdPatch, 0 },
-
-  {  zSolaris_WidecName,    zSolaris_WidecList,
-     apzSolaris_WidecMachs,
-     SOLARIS_WIDEC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris_WidecTests,   apzSolaris_WidecPatch, 0 },
+  {  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 },
 
   {  zStatsswtchName,    zStatsswtchList,
      apzStatsswtchMachs,
@@ -9689,11 +10351,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SVR4_GETCWD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSvr4_GetcwdTests,   apzSvr4_GetcwdPatch, 0 },
 
-  {  zSvr4_KrnlName,    zSvr4_KrnlList,
-     apzSvr4_KrnlMachs,
-     SVR4_KRNL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSvr4_KrnlTests,   apzSvr4_KrnlPatch, 0 },
-
   {  zSvr4_ProfilName,    zSvr4_ProfilList,
      apzSvr4_ProfilMachs,
      SVR4_PROFIL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9729,16 +10386,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      TINFO_CPLUSPLUS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aTinfo_CplusplusTests,   apzTinfo_CplusplusPatch, 0 },
 
-  {  zUltrix_Atexit_ParamName,    zUltrix_Atexit_ParamList,
-     apzUltrix_Atexit_ParamMachs,
-     ULTRIX_ATEXIT_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_Atexit_ParamTests,   apzUltrix_Atexit_ParamPatch, 0 },
-
-  {  zUltrix_Atof_ParamName,    zUltrix_Atof_ParamList,
-     apzUltrix_Atof_ParamMachs,
-     ULTRIX_ATOF_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_Atof_ParamTests,   apzUltrix_Atof_ParamPatch, 0 },
-
   {  zUltrix_ConstName,    zUltrix_ConstList,
      apzUltrix_ConstMachs,
      ULTRIX_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9749,91 +10396,26 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ULTRIX_CONST2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aUltrix_Const2Tests,   apzUltrix_Const2Patch, 0 },
 
-  {  zUltrix_Const3Name,    zUltrix_Const3List,
-     apzUltrix_Const3Machs,
-     ULTRIX_CONST3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_Const3Tests,   apzUltrix_Const3Patch, 0 },
-
-  {  zUltrix_Fix_FixprotoName,    zUltrix_Fix_FixprotoList,
-     apzUltrix_Fix_FixprotoMachs,
-     ULTRIX_FIX_FIXPROTO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_Fix_FixprotoTests,   apzUltrix_Fix_FixprotoPatch, 0 },
-
-  {  zUltrix_IfdefName,    zUltrix_IfdefList,
-     apzUltrix_IfdefMachs,
-     ULTRIX_IFDEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_IfdefTests,   apzUltrix_IfdefPatch, 0 },
-
-  {  zUltrix_LocaleName,    zUltrix_LocaleList,
-     apzUltrix_LocaleMachs,
-     ULTRIX_LOCALE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_LocaleTests,   apzUltrix_LocalePatch, 0 },
-
-  {  zUltrix_Math_IfdefName,    zUltrix_Math_IfdefList,
-     apzUltrix_Math_IfdefMachs,
-     ULTRIX_MATH_IFDEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_Math_IfdefTests,   apzUltrix_Math_IfdefPatch, 0 },
-
-  {  zUltrix_Nested_IoctlName,    zUltrix_Nested_IoctlList,
-     apzUltrix_Nested_IoctlMachs,
-     ULTRIX_NESTED_IOCTL_TEST_CT, FD_MACH_ONLY,
-     aUltrix_Nested_IoctlTests,   apzUltrix_Nested_IoctlPatch, 0 },
-
-  {  zUltrix_Nested_SvcName,    zUltrix_Nested_SvcList,
-     apzUltrix_Nested_SvcMachs,
-     ULTRIX_NESTED_SVC_TEST_CT, FD_MACH_ONLY,
-     aUltrix_Nested_SvcTests,   apzUltrix_Nested_SvcPatch, 0 },
-
-  {  zUltrix_StatName,    zUltrix_StatList,
-     apzUltrix_StatMachs,
-     ULTRIX_STAT_TEST_CT, FD_MACH_ONLY,
-     aUltrix_StatTests,   apzUltrix_StatPatch, 0 },
-
-  {  zUltrix_StaticName,    zUltrix_StaticList,
-     apzUltrix_StaticMachs,
-     ULTRIX_STATIC_TEST_CT, FD_MACH_ONLY,
-     aUltrix_StaticTests,   apzUltrix_StaticPatch, 0 },
-
-  {  zUltrix_StdlibName,    zUltrix_StdlibList,
-     apzUltrix_StdlibMachs,
-     ULTRIX_STDLIB_TEST_CT, FD_MACH_ONLY,
-     aUltrix_StdlibTests,   apzUltrix_StdlibPatch, 0 },
-
-  {  zUltrix_StringsName,    zUltrix_StringsList,
-     apzUltrix_StringsMachs,
-     ULTRIX_STRINGS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUltrix_StringsTests,   apzUltrix_StringsPatch, 0 },
-
-  {  zUltrix_Strings2Name,    zUltrix_Strings2List,
-     apzUltrix_Strings2Machs,
-     ULTRIX_STRINGS2_TEST_CT, FD_MACH_ONLY,
-     aUltrix_Strings2Tests,   apzUltrix_Strings2Patch, 0 },
-
-  {  zUltrix_Sys_TimeName,    zUltrix_Sys_TimeList,
-     apzUltrix_Sys_TimeMachs,
-     ULTRIX_SYS_TIME_TEST_CT, FD_MACH_ONLY,
-     aUltrix_Sys_TimeTests,   apzUltrix_Sys_TimePatch, 0 },
-
-  {  zUltrix_UnistdName,    zUltrix_UnistdList,
-     apzUltrix_UnistdMachs,
-     ULTRIX_UNISTD_TEST_CT, FD_MACH_ONLY,
-     aUltrix_UnistdTests,   apzUltrix_UnistdPatch, 0 },
-
-  {  zUnicosmk_RestrictName,    zUnicosmk_RestrictList,
-     apzUnicosmk_RestrictMachs,
-     UNICOSMK_RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUnicosmk_RestrictTests,   apzUnicosmk_RestrictPatch, 0 },
-
-  {  zUw7_Byteorder_FixName,    zUw7_Byteorder_FixList,
-     apzUw7_Byteorder_FixMachs,
-     UW7_BYTEORDER_FIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aUw7_Byteorder_FixTests,   apzUw7_Byteorder_FixPatch, 0 },
-
   {  zVa_I960_MacroName,    zVa_I960_MacroList,
      apzVa_I960_MacroMachs,
      VA_I960_MACRO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aVa_I960_MacroTests,   apzVa_I960_MacroPatch, 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_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_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 },
+
   {  zVoid_NullName,    zVoid_NullList,
      apzVoid_NullMachs,
      VOID_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9859,21 +10441,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      VXWORKS_TIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aVxworks_TimeTests,   apzVxworks_TimePatch, 0 },
 
-  {  zWindiss_Math1Name,    zWindiss_Math1List,
-     apzWindiss_Math1Machs,
-     WINDISS_MATH1_TEST_CT, FD_MACH_ONLY,
-     aWindiss_Math1Tests,   apzWindiss_Math1Patch, 0 },
-
-  {  zWindiss_Math2Name,    zWindiss_Math2List,
-     apzWindiss_Math2Machs,
-     WINDISS_MATH2_TEST_CT, FD_MACH_ONLY,
-     aWindiss_Math2Tests,   apzWindiss_Math2Patch, 0 },
-
-  {  zWindiss_ValistName,    zWindiss_ValistList,
-     apzWindiss_ValistMachs,
-     WINDISS_VALIST_TEST_CT, FD_MACH_ONLY,
-     aWindiss_ValistTests,   apzWindiss_ValistPatch, 0 },
-
   {  zX11_ClassName,    zX11_ClassList,
      apzX11_ClassMachs,
      X11_CLASS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,