OSDN Git Service

2009-08-28 Konrad Trifunovic <konrad.trifunovic@gmail.com>
[pf3gnuchains/gcc-fork.git] / fixincludes / fixincl.x
index 746c09b..8b3422a 100644 (file)
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Saturday June  7, 2008 at 03:19:21 PM PDT
+ * It has been AutoGen-ed  Friday August 28, 2009 at 10:55:38 AM PDT
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Jun  7 15:19:21 PDT 2008
+/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Aug 28 10:55:38 PDT 2009
  *
  * 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 177 fixup descriptions.
+ * This file contains 204 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: you can redistribute it and/or modify it
+ *  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 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;
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
@@ -480,6 +485,43 @@ static const char* apzAab_Sun_MemcpyPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Aix_Complex fix
+ */
+tSCC zAix_ComplexName[] =
+     "aix_complex";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_ComplexList[] =
+  "complex.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_ComplexMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_ComplexSelect0[] =
+       "#define[ \t]_Complex_I[ \t]__I";
+
+#define    AIX_COMPLEX_TEST_CT  1
+static tTestDesc aAix_ComplexTests[] = {
+  { TT_EGREP,    zAix_ComplexSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Complex
+ */
+static const char* apzAix_ComplexPatch[] = {
+    "format",
+    "#define _Complex_I (__extension__ 1.0iF)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Aix_Pthread fix
  */
 tSCC zAix_PthreadName[] =
@@ -517,76 +559,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.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.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.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.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.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 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -872,7 +1088,7 @@ static tTestDesc aAlpha_Bad_LvalTests[] = {
 /*
  *  Fix Command Arguments for Alpha_Bad_Lval
  */
-static const char* apzAlpha_Bad_LvalPatch[] = { "sed",
+static const char* apzAlpha_Bad_LvalPatch[] = { sed_cmd_z,
     "-e", "s/^[ \t]*#[ \t]*define[ \t][ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*\\(_.*\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/",
     (char*)NULL };
 
@@ -913,6 +1129,41 @@ static const char* apzAlpha_GetoptPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Alpha_If_Semicolon fix
+ */
+tSCC zAlpha_If_SemicolonName[] =
+     "alpha_if_semicolon";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAlpha_If_SemicolonList[] =
+  "net/if.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAlpha_If_SemicolonMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAlpha_If_SemicolonSelect0[] =
+       "struct[ \t]+sockaddr[ \t]+vmif_paddr[ \t]+/\\*";
+
+#define    ALPHA_IF_SEMICOLON_TEST_CT  1
+static tTestDesc aAlpha_If_SemicolonTests[] = {
+  { TT_EGREP,    zAlpha_If_SemicolonSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Alpha_If_Semicolon
+ */
+static const char* apzAlpha_If_SemicolonPatch[] = {
+    "format",
+    "struct sockaddr vmif_paddr;\t/*",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Alpha_Parens fix
  */
 tSCC zAlpha_ParensName[] =
@@ -1057,7 +1308,7 @@ static tTestDesc aAlpha_Pthread_InitTests[] = {
 /*
  *  Fix Command Arguments for Alpha_Pthread_Init
  */
-static const char* apzAlpha_Pthread_InitPatch[] = { "sed",
+static const char* apzAlpha_Pthread_InitPatch[] = { sed_cmd_z,
     "-e", "s@MVALID\\(.*\\)A}@MVALID\\1A, 0, 0, 0, 0, 0, 0 }@\n\
 s@MVALID\\(.*\\)_}@MVALID\\1_, 0, 0, 0, 0 }@\n\
 s@CVALID\\(.*\\)A}@CVALID\\1A, 0, 0, 0, 0 }@\n\
@@ -1133,7 +1384,7 @@ static tTestDesc aAlpha_WcharTests[] = {
 /*
  *  Fix Command Arguments for Alpha_Wchar
  */
-static const char* apzAlpha_WcharPatch[] = { "sed",
+static const char* apzAlpha_WcharPatch[] = { sed_cmd_z,
     "-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 };
@@ -1462,7 +1713,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 };
@@ -1786,151 +2037,427 @@ static const char* apzDarwin_Private_ExternPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Dec_Intern_Asm fix
+ *  Description of Darwin_Stdint_1 fix
  */
-tSCC zDec_Intern_AsmName[] =
-     "dec_intern_asm";
+tSCC zDarwin_Stdint_1Name[] =
+     "darwin_stdint_1";
 
 /*
  *  File name selection pattern
  */
-tSCC zDec_Intern_AsmList[] =
-  "c_asm.h\0";
+tSCC zDarwin_Stdint_1List[] =
+  "stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzDec_Intern_AsmMachs (const char**)NULL
-#define DEC_INTERN_ASM_TEST_CT  0
-#define aDec_Intern_AsmTests   (tTestDesc*)NULL
+tSCC* apzDarwin_Stdint_1Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
 
 /*
- *  Fix Command Arguments for Dec_Intern_Asm
+ *  content selection pattern - do fix if pattern found
  */
-static const char* apzDec_Intern_AsmPatch[] = { "sed",
-    "-e", "/^[ \t]*float[ \t]*fasm/i\\\n\
-#ifdef __DECC\n",
-    "-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n\
-#endif\n",
+tSCC zDarwin_Stdint_1Select0[] =
+       "#define UINT8_C\\(v\\)[ \t]+\\(v ## U\\)\n\
+#define UINT16_C\\(v\\)[ \t]+\\(v ## U\\)";
+
+#define    DARWIN_STDINT_1_TEST_CT  1
+static tTestDesc aDarwin_Stdint_1Tests[] = {
+  { TT_EGREP,    zDarwin_Stdint_1Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Stdint_1
+ */
+static const char* apzDarwin_Stdint_1Patch[] = {
+    "format",
+    "#define UINT8_C(v)\tv\n\
+#define UINT16_C(v)\tv",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Djgpp_Wchar_H fix
+ *  Description of Darwin_Stdint_2 fix
  */
-tSCC zDjgpp_Wchar_HName[] =
-     "djgpp_wchar_h";
+tSCC zDarwin_Stdint_2Name[] =
+     "darwin_stdint_2";
 
 /*
  *  File name selection pattern
  */
-#define zDjgpp_Wchar_HList (char*)NULL
+tSCC zDarwin_Stdint_2List[] =
+  "stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzDjgpp_Wchar_HMachs (const char**)NULL
+tSCC* apzDarwin_Stdint_2Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zDjgpp_Wchar_HSelect0[] =
-       "__DJ_wint_t";
-
-/*
- *  content bypass pattern - skip fix if pattern found
- */
-tSCC zDjgpp_Wchar_HBypass0[] =
-       "sys/djtypes.h";
+tSCC zDarwin_Stdint_2Select0[] =
+       "#if __WORDSIZE == 64\n\
+#define INTPTR_MIN[ \t]+INT64_MIN\n\
+#define INTPTR_MAX[ \t]+INT64_MAX\n\
+#else\n\
+#define INTPTR_MIN[ \t]+INT32_MIN\n\
+#define INTPTR_MAX[ \t]+INT32_MAX\n\
+#endif";
 
-#define    DJGPP_WCHAR_H_TEST_CT  2
-static tTestDesc aDjgpp_Wchar_HTests[] = {
-  { TT_NEGREP,   zDjgpp_Wchar_HBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zDjgpp_Wchar_HSelect0, (regex_t*)NULL }, };
+#define    DARWIN_STDINT_2_TEST_CT  1
+static tTestDesc aDarwin_Stdint_2Tests[] = {
+  { TT_EGREP,    zDarwin_Stdint_2Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Djgpp_Wchar_H
+ *  Fix Command Arguments for Darwin_Stdint_2
  */
-static const char* apzDjgpp_Wchar_HPatch[] = {
+static const char* apzDarwin_Stdint_2Patch[] = {
     "format",
-    "%0\n\
-#include <sys/djtypes.h>",
-    "#include <stddef.h>",
+    "#if __WORDSIZE == 64\n\
+#define INTPTR_MAX 9223372036854775807L\n\
+#define INTPTR_MIN (-INTPTR_MAX-1)\n\
+#else\n\
+#define INTPTR_MAX 2147483647L\n\
+#define INTPTR_MIN (-INTPTR_MAX-1)\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Ecd_Cursor fix
+ *  Description of Darwin_Stdint_3 fix
  */
-tSCC zEcd_CursorName[] =
-     "ecd_cursor";
+tSCC zDarwin_Stdint_3Name[] =
+     "darwin_stdint_3";
 
 /*
  *  File name selection pattern
  */
-tSCC zEcd_CursorList[] =
-  "sunwindow/win_lock.h\0sunwindow/win_cursor.h\0";
+tSCC zDarwin_Stdint_3List[] =
+  "stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzEcd_CursorMachs (const char**)NULL
+tSCC* apzDarwin_Stdint_3Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zEcd_CursorSelect0[] =
-       "ecd\\.cursor";
+tSCC zDarwin_Stdint_3Select0[] =
+       "#if __WORDSIZE == 64\n\
+#define UINTPTR_MAX[ \t]+UINT64_MAX\n\
+#else\n\
+#define UINTPTR_MAX[ \t]+UINT32_MAX\n\
+#endif";
 
-#define    ECD_CURSOR_TEST_CT  1
-static tTestDesc aEcd_CursorTests[] = {
-  { TT_EGREP,    zEcd_CursorSelect0, (regex_t*)NULL }, };
+#define    DARWIN_STDINT_3_TEST_CT  1
+static tTestDesc aDarwin_Stdint_3Tests[] = {
+  { TT_EGREP,    zDarwin_Stdint_3Select0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Ecd_Cursor
+ *  Fix Command Arguments for Darwin_Stdint_3
  */
-static const char* apzEcd_CursorPatch[] = {
+static const char* apzDarwin_Stdint_3Patch[] = {
     "format",
-    "ecd_cursor",
+    "#if __WORDSIZE == 64\n\
+#define UINTPTR_MAX 18446744073709551615UL\n\
+#else\n\
+#define UINTPTR_MAX 4294967295UL\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Exception_Structure fix
+ *  Description of Darwin_Stdint_4 fix
  */
-tSCC zException_StructureName[] =
-     "exception_structure";
+tSCC zDarwin_Stdint_4Name[] =
+     "darwin_stdint_4";
 
 /*
  *  File name selection pattern
  */
-tSCC zException_StructureList[] =
-  "math.h\0";
+tSCC zDarwin_Stdint_4List[] =
+  "stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzException_StructureMachs (const char**)NULL
+tSCC* apzDarwin_Stdint_4Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zException_StructureSelect0[] =
-       "matherr";
+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 }, };
 
 /*
- *  content bypass pattern - skip fix if pattern found
+ *  Fix Command Arguments for Darwin_Stdint_4
  */
-tSCC zException_StructureBypass0[] =
-       "matherr.*(struct exception|__MATH_EXCEPTION|[ \\t]*__FP_EXCEPTION[ \\t]*\\*[ \\t]*)";
+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 };
 
-#define    EXCEPTION_STRUCTURE_TEST_CT  2
-static tTestDesc aException_StructureTests[] = {
-  { TT_NEGREP,   zException_StructureBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zException_StructureSelect0, (regex_t*)NULL }, };
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Stdint_5 fix
+ */
+tSCC zDarwin_Stdint_5Name[] =
+     "darwin_stdint_5";
 
 /*
- *  Fix Command Arguments for Exception_Structure
+ *  File name selection pattern
  */
-static const char* apzException_StructurePatch[] = {
-    "wrap",
-    "struct exception;\n",
+tSCC zDarwin_Stdint_5List[] =
+  "stdint.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.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.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[] =
+     "dec_intern_asm";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDec_Intern_AsmList[] =
+  "c_asm.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzDec_Intern_AsmMachs (const char**)NULL
+#define DEC_INTERN_ASM_TEST_CT  0
+#define aDec_Intern_AsmTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Dec_Intern_Asm
+ */
+static const char* apzDec_Intern_AsmPatch[] = { sed_cmd_z,
+    "-e", "/^[ \t]*float[ \t]*fasm/i\\\n\
+#ifdef __DECC\n",
+    "-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n\
+#endif\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Djgpp_Wchar_H fix
+ */
+tSCC zDjgpp_Wchar_HName[] =
+     "djgpp_wchar_h";
+
+/*
+ *  File name selection pattern
+ */
+#define zDjgpp_Wchar_HList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzDjgpp_Wchar_HMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDjgpp_Wchar_HSelect0[] =
+       "__DJ_wint_t";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zDjgpp_Wchar_HBypass0[] =
+       "sys/djtypes.h";
+
+#define    DJGPP_WCHAR_H_TEST_CT  2
+static tTestDesc aDjgpp_Wchar_HTests[] = {
+  { TT_NEGREP,   zDjgpp_Wchar_HBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zDjgpp_Wchar_HSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Djgpp_Wchar_H
+ */
+static const char* apzDjgpp_Wchar_HPatch[] = {
+    "format",
+    "%0\n\
+#include <sys/djtypes.h>",
+    "#include <stddef.h>",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Ecd_Cursor fix
+ */
+tSCC zEcd_CursorName[] =
+     "ecd_cursor";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zEcd_CursorList[] =
+  "sunwindow/win_lock.h\0sunwindow/win_cursor.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzEcd_CursorMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zEcd_CursorSelect0[] =
+       "ecd\\.cursor";
+
+#define    ECD_CURSOR_TEST_CT  1
+static tTestDesc aEcd_CursorTests[] = {
+  { TT_EGREP,    zEcd_CursorSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Ecd_Cursor
+ */
+static const char* apzEcd_CursorPatch[] = {
+    "format",
+    "ecd_cursor",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -2116,7 +2643,7 @@ static tTestDesc aGlibc_C99_Inline_2Tests[] = {
 /*
  *  Fix Command Arguments for Glibc_C99_Inline_2
  */
-static const char* apzGlibc_C99_Inline_2Patch[] = { "sed",
+static const char* apzGlibc_C99_Inline_2Patch[] = { sed_cmd_z,
     "-e", "s/extern int \\(stat\\|lstat\\|fstat\\|mknod\\)/#ifdef __GNUC_GNU_INLINE__\\\n\
 extern\\\n\
 #endif\\\n\
@@ -2246,8 +2773,11 @@ 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 } }/",
+static const char* apzGlibc_Mutex_InitPatch[] = { sed_cmd_z,
+    "-e", "/define[ \t]\\+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\\|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/",
@@ -2257,6 +2787,87 @@ static const char* apzGlibc_Mutex_InitPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Glibc_Stdint fix
+ */
+tSCC zGlibc_StdintName[] =
+     "glibc_stdint";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zGlibc_StdintList[] =
+  "stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzGlibc_StdintMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zGlibc_StdintSelect0[] =
+       "GNU C Library";
+
+#define    GLIBC_STDINT_TEST_CT  1
+static tTestDesc aGlibc_StdintTests[] = {
+  { TT_EGREP,    zGlibc_StdintSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Glibc_Stdint
+ */
+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 };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  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[] =
@@ -2372,6 +2983,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[] =
@@ -2427,70 +3083,26 @@ tSCC zHpux11_Cpp_Pow_InlineList[] =
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux11_Cpp_Pow_InlineMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux11_Cpp_Pow_InlineSelect0[] =
-       " +inline double pow\\(double d,int expon\\) \\{\n\
- +return pow\\(d, \\(double\\)expon\\);\n\
- +\\}\n";
-
-#define    HPUX11_CPP_POW_INLINE_TEST_CT  1
-static tTestDesc aHpux11_Cpp_Pow_InlineTests[] = {
-  { TT_EGREP,    zHpux11_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux11_Cpp_Pow_Inline
- */
-static const char* apzHpux11_Cpp_Pow_InlinePatch[] = {
-    "format",
-    "",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of 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 };
+#define apzHpux11_Cpp_Pow_InlineMachs (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";
+tSCC zHpux11_Cpp_Pow_InlineSelect0[] =
+       " +inline double pow\\(double d,int expon\\) \\{\n\
+ +return pow\\(d, \\(double\\)expon\\);\n\
+ +\\}\n";
 
-#define    HPPA_HPUX_FP_MACROS_TEST_CT  1
-static tTestDesc aHppa_Hpux_Fp_MacrosTests[] = {
-  { TT_EGREP,    zHppa_Hpux_Fp_MacrosSelect0, (regex_t*)NULL }, };
+#define    HPUX11_CPP_POW_INLINE_TEST_CT  1
+static tTestDesc aHpux11_Cpp_Pow_InlineTests[] = {
+  { TT_EGREP,    zHpux11_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hppa_Hpux_Fp_Macros
+ *  Fix Command Arguments for Hpux11_Cpp_Pow_Inline
  */
-static const char* apzHppa_Hpux_Fp_MacrosPatch[] = {
+static const char* apzHpux11_Cpp_Pow_InlinePatch[] = {
     "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 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -2741,6 +3353,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[] =
@@ -2812,41 +3461,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[] =
@@ -2917,7 +3531,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]*) {.*}@@",
@@ -3014,7 +3628,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
@@ -3036,13 +3653,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[] =
@@ -3087,7 +3741,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
  */
@@ -3239,79 +3893,252 @@ 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.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.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.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.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)",
+    "#ifdef __LP64__\n\
+#  define\tUINT_%164_MAX\tULONG_MAX\n\
+#else\n\
+%0\n\
+#endif",
     (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 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3580,7 +4407,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 };
 
@@ -4386,7 +5213,7 @@ static tTestDesc aNested_Sys_LimitsTests[] = {
 /*
  *  Fix Command Arguments for Nested_Sys_Limits
  */
-static const char* apzNested_Sys_LimitsPatch[] = { "sed",
+static const char* apzNested_Sys_LimitsPatch[] = { sed_cmd_z,
     "-e", "/CHILD_MAX/s,/\\* Max, Max,",
     "-e", "/OPEN_MAX/s,/\\* Max, Max,",
     (char*)NULL };
@@ -4512,6 +5339,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.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.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[] =
@@ -4690,6 +5607,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[] =
@@ -4725,6 +5696,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[] =
@@ -4824,41 +5832,6 @@ typedef __regmatch_t\tregmatch_t;",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Pthread_Page_Size fix
- */
-tSCC zPthread_Page_SizeName[] =
-     "pthread_page_size";
-
-/*
- *  File name selection pattern
- */
-tSCC zPthread_Page_SizeList[] =
-  "pthread.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzPthread_Page_SizeMachs (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[] =
@@ -5147,7 +6120,7 @@ static tTestDesc aSco_MathTests[] = {
 /*
  *  Fix Command Arguments for Sco_Math
  */
-static const char* apzSco_MathPatch[] = { "sed",
+static const char* apzSco_MathPatch[] = { sed_cmd_z,
     "-e", "/#define.*__fp_class(a) \\\\/i\\\n\
 #ifndef __GNUC__\n",
     "-e", "/.*__builtin_generic/a\\\n\
@@ -5635,6 +6608,162 @@ static const char* apzSolaris_Once_Init_2Patch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Solaris_Int_Const fix
+ */
+tSCC zSolaris_Int_ConstName[] =
+     "solaris_int_const";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSolaris_Int_ConstList[] =
+  "sys/int_const.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSolaris_Int_ConstMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Int_ConstSelect0[] =
+       "@\\(#\\)int_const.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+#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_Int_Const
+ */
+static const char* apzSolaris_Int_ConstPatch[] = {
+    "format",
+    "#define\tUINT8_C(c)\t(c)\n\
+%1\n\
+#define\tUINT16_C(c)\t(c)",
+    "^#define[ \t]+UINT8_C\\(c\\)[ \t]+__CONCAT__.*\n\
+(/*.**/)\n\
+#define[ \t]+UINT16_C\\(c\\)[ \t]+__CONCAT__.*",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Solaris_Int_Limits_1 fix
+ */
+tSCC zSolaris_Int_Limits_1Name[] =
+     "solaris_int_limits_1";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSolaris_Int_Limits_1List[] =
+  "sys/int_limits.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSolaris_Int_Limits_1Machs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Int_Limits_1Select0[] =
+       "@\\(#\\)int_limits.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+#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_Int_Limits_1
+ */
+static const char* apzSolaris_Int_Limits_1Patch[] = {
+    "format",
+    "#define\tUINT8_MAX\t(255)\n\
+#define\tUINT16_MAX\t(65535)",
+    "^#define[ \t]+UINT8_MAX[ \t]+\\(255U\\)\n\
+#define[ \t]+UINT16_MAX[ \t]+\\(65535U\\)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Solaris_Int_Limits_2 fix
+ */
+tSCC zSolaris_Int_Limits_2Name[] =
+     "solaris_int_limits_2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSolaris_Int_Limits_2List[] =
+  "sys/int_limits.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSolaris_Int_Limits_2Machs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Int_Limits_2Select0[] =
+       "@\\(#\\)int_limits.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+#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_Int_Limits_2
+ */
+static const char* apzSolaris_Int_Limits_2Patch[] = {
+    "format",
+    "#define\t%1_FAST16_%2 %132_%2",
+    "^#define[ \t]+(INT|UINT)_FAST16_(MAX|MIN)[ \t](INT|UINT)16.*",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Solaris_Int_Types fix
+ */
+tSCC zSolaris_Int_TypesName[] =
+     "solaris_int_types";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSolaris_Int_TypesList[] =
+  "sys/int_types.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSolaris_Int_TypesMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Int_TypesSelect0[] =
+       "__STDC__ - 0 == 0";
+
+/*
+ *  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 Solaris_Int_Types
+ */
+static const char* apzSolaris_Int_TypesPatch[] = {
+    "format",
+    "(defined(_STDC_C99) || !defined(_STRICT_STDC) || defined(__GNUC__))",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Solaris_Stdio_Tag fix
  */
 tSCC zSolaris_Stdio_TagName[] =
@@ -5670,7 +6799,7 @@ static tTestDesc aSolaris_Stdio_TagTests[] = {
 /*
  *  Fix Command Arguments for Solaris_Stdio_Tag
  */
-static const char* apzSolaris_Stdio_TagPatch[] = { "sed",
+static const char* apzSolaris_Stdio_TagPatch[] = { sed_cmd_z,
     "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/",
     (char*)NULL };
 
@@ -5779,7 +6908,7 @@ static tTestDesc aStdio_Va_ListTests[] = {
 /*
  *  Fix Command Arguments for Stdio_Va_List
  */
-static const char* apzStdio_Va_ListPatch[] = { "sed",
+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\
@@ -5829,7 +6958,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\
@@ -6210,7 +7339,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",
@@ -6248,7 +7377,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 };
 
@@ -6356,7 +7485,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 };
 
@@ -6546,7 +7675,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);/",
@@ -6851,7 +7980,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\
@@ -6948,7 +8077,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 };
@@ -7121,7 +8250,7 @@ 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\
@@ -7173,9 +8302,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          223
+#define REGEX_COUNT          247
 #define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT            177
+#define FIX_COUNT            204
 
 /*
  *  Enumerate the fixes
@@ -7189,9 +8318,14 @@ typedef enum {
     AAB_FD_ZERO_SELECTBITS_H_FIXIDX,
     AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
     AAB_SUN_MEMCPY_FIXIDX,
+    AIX_COMPLEX_FIXIDX,
     AIX_PTHREAD_FIXIDX,
+    AIX_STDINT_1_FIXIDX,
+    AIX_STDINT_2_FIXIDX,
+    AIX_STDINT_3_FIXIDX,
+    AIX_STDINT_4_FIXIDX,
+    AIX_STDINT_5_FIXIDX,
     AIX_SYSMACHINE_FIXIDX,
-    AIX_SYSWAIT_FIXIDX,
     AIX_SYSWAIT_2_FIXIDX,
     AIX_VOLATILE_FIXIDX,
     ALPHA___ASSERT_FIXIDX,
@@ -7201,6 +8335,7 @@ 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,
@@ -7223,10 +8358,16 @@ typedef enum {
     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,
@@ -7235,32 +8376,40 @@ typedef enum {
     GLIBC_C99_INLINE_3_FIXIDX,
     GLIBC_C99_INLINE_4_FIXIDX,
     GLIBC_MUTEX_INIT_FIXIDX,
+    GLIBC_STDINT_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,
@@ -7292,15 +8441,18 @@ typedef enum {
     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,
@@ -7320,6 +8472,10 @@ typedef enum {
     SOLARIS_RWLOCK_INIT_1_FIXIDX,
     SOLARIS_ONCE_INIT_1_FIXIDX,
     SOLARIS_ONCE_INIT_2_FIXIDX,
+    SOLARIS_INT_CONST_FIXIDX,
+    SOLARIS_INT_LIMITS_1_FIXIDX,
+    SOLARIS_INT_LIMITS_2_FIXIDX,
+    SOLARIS_INT_TYPES_FIXIDX,
     SOLARIS_STDIO_TAG_FIXIDX,
     STATSSWTCH_FIXIDX,
     STDIO_STDARG_H_FIXIDX,
@@ -7401,21 +8557,46 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
      aAab_Sun_MemcpyTests,   apzAab_Sun_MemcpyPatch, 0 },
 
+  {  zAix_ComplexName,    zAix_ComplexList,
+     apzAix_ComplexMachs,
+     AIX_COMPLEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_ComplexTests,   apzAix_ComplexPatch, 0 },
+
   {  zAix_PthreadName,    zAix_PthreadList,
      apzAix_PthreadMachs,
      AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAix_PthreadTests,   apzAix_PthreadPatch, 0 },
 
+  {  zAix_Stdint_1Name,    zAix_Stdint_1List,
+     apzAix_Stdint_1Machs,
+     AIX_STDINT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_1Tests,   apzAix_Stdint_1Patch, 0 },
+
+  {  zAix_Stdint_2Name,    zAix_Stdint_2List,
+     apzAix_Stdint_2Machs,
+     AIX_STDINT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_2Tests,   apzAix_Stdint_2Patch, 0 },
+
+  {  zAix_Stdint_3Name,    zAix_Stdint_3List,
+     apzAix_Stdint_3Machs,
+     AIX_STDINT_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_3Tests,   apzAix_Stdint_3Patch, 0 },
+
+  {  zAix_Stdint_4Name,    zAix_Stdint_4List,
+     apzAix_Stdint_4Machs,
+     AIX_STDINT_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_4Tests,   apzAix_Stdint_4Patch, 0 },
+
+  {  zAix_Stdint_5Name,    zAix_Stdint_5List,
+     apzAix_Stdint_5Machs,
+     AIX_STDINT_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_5Tests,   apzAix_Stdint_5Patch, 0 },
+
   {  zAix_SysmachineName,    zAix_SysmachineList,
      apzAix_SysmachineMachs,
      AIX_SYSMACHINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAix_SysmachineTests,   apzAix_SysmachinePatch, 0 },
 
-  {  zAix_SyswaitName,    zAix_SyswaitList,
-     apzAix_SyswaitMachs,
-     AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAix_SyswaitTests,   apzAix_SyswaitPatch, 0 },
-
   {  zAix_Syswait_2Name,    zAix_Syswait_2List,
      apzAix_Syswait_2Machs,
      AIX_SYSWAIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -7461,6 +8642,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,
@@ -7571,6 +8757,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,
@@ -7586,11 +8807,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,
@@ -7631,6 +8847,16 @@ 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_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,
@@ -7646,6 +8872,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,
@@ -7656,11 +8887,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,
@@ -7686,6 +8912,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,
@@ -7696,11 +8927,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,
@@ -7726,6 +8952,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,
@@ -7751,16 +8982,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,
@@ -7916,6 +9172,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,
@@ -7941,11 +9207,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,
@@ -7956,11 +9232,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,
@@ -8056,6 +9327,26 @@ 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_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_TypesName,    zSolaris_Int_TypesList,
+     apzSolaris_Int_TypesMachs,
+     SOLARIS_INT_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Int_TypesTests,   apzSolaris_Int_TypesPatch, 0 },
+
   {  zSolaris_Stdio_TagName,    zSolaris_Stdio_TagList,
      apzSolaris_Stdio_TagMachs,
      SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,