update generated files

From-SVN: r20181

3 files changed, 646 insertions, 201 deletions

diff --git a/contrib/fixinc/fixincl.sh b/contrib/fixinc/fixincl.sh
index c231933..bd21aac 100755
--- a/contrib/fixinc/fixincl.sh
+++ b/contrib/fixinc/fixincl.sh
@@ -2,7 +2,7 @@
 #
 # DO NOT EDIT THIS FILE   (fixincl.sh)
 # 
-# It has been autogen-ed  Thursday May 28, 1998 at 08:21:16 AM PDT
+# It has been autogen-ed  Tuesday June 02, 1998 at 06:46:41 AM PDT
 # From the definitions    inclhack.def
 # and the template file   inclhack.tpl
 #
@@ -10,7 +10,7 @@
 # files which are fixed to work correctly with ANSI C and placed in a
 # directory that GNU C will search.
 #
-# This script contains 101 fixup scripts.
+# This script contains 108 fixup scripts.
 #
 # See README-fixinc for more information.
 #
diff --git a/contrib/fixinc/fixincl.x b/contrib/fixinc/fixincl.x
index c43e40a..f366df3 100644
--- a/contrib/fixinc/fixincl.x
+++ b/contrib/fixinc/fixincl.x
@@ -1,7 +1,7 @@
 /*
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been autogen-ed  Thursday May 28, 1998 at 08:21:12 AM PDT
+ * It has been autogen-ed  Tuesday June 02, 1998 at 06:45:43 AM PDT
  * From the definitions    inclhack.def
  * and the template file   fixincl.tpl
  *
@@ -9,7 +9,7 @@
  * files which are fixed to work correctly with ANSI C and placed in a
  * directory that GNU C will search.
  *
- * This script contains 101 fixup scripts.
+ * This script contains 108 fixup scripts.
  *
  * See README-fixinc for more information.
  *
@@ -373,7 +373,49 @@ const char* apzBadquotePatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  13 - Broken_Assert_Stdio fix
+ *  Description  13 - Bad_Lval fix
+ */
+tSCC zBad_LvalName[] =
+     "Bad_Lval";
+/*
+ *  File name selection pattern
+ */
+tSCC zBad_LvalList[] =
+        "|" "libgen.h"
+        "|" "dirent.h"
+        "|" "ftw.h"
+        "|" "grp.h"
+        "|" "ndbm.h"
+        "|" "pthread.h"
+        "|" "pwd.h"
+        "|" "signal.h"
+        "|" "standards.h"
+        "|" "stdlib.h"
+        "|" "string.h"
+        "|" "stropts.h"
+        "|" "time.h"
+        "|" "unistd.h" "|";
+
+/*
+ *  content selection pattern
+ */
+tSCC zBad_LvalSelect0[] =
+       "^[ \t]*#[ \t]*pragma[ \t]extern_prefix";
+
+#define    BAD_LVAL_TEST_CT  1
+tTestDesc aBad_LvalTests[] = {
+    { TT_EGREP,  zBad_LvalSelect0, (regex_t*)NULL } };
+
+/*
+ *  Fix Command Arguments for Bad_Lval
+ */
+const char* apzBad_LvalPatch[] = { "sed",
+    "-e" "s/^[ \t]*#[ \t]*define[ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*\\(_.\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description  14 - Broken_Assert_Stdio fix
  */
 tSCC zBroken_Assert_StdioName[] =
      "Broken_Assert_Stdio";
@@ -410,7 +452,7 @@ const char* apzBroken_Assert_StdioPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  14 - Broken_Assert_Stdlib fix
+ *  Description  15 - Broken_Assert_Stdlib fix
  */
 tSCC zBroken_Assert_StdlibName[] =
      "Broken_Assert_Stdlib";
@@ -449,7 +491,7 @@ const char* apzBroken_Assert_StdlibPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  15 - Bsd43_Io_Macros fix
+ *  Description  16 - Bsd43_Io_Macros fix
  */
 tSCC zBsd43_Io_MacrosName[] =
      "Bsd43_Io_Macros";
@@ -478,7 +520,7 @@ const char* apzBsd43_Io_MacrosPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  16 - Cxx_Cmnt_Hpux fix
+ *  Description  17 - Cxx_Cmnt_Hpux fix
  */
 tSCC zCxx_Cmnt_HpuxName[] =
      "Cxx_Cmnt_Hpux";
@@ -507,7 +549,7 @@ const char* apzCxx_Cmnt_HpuxPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  17 - Cxx_Cmnt_Irix fix
+ *  Description  18 - Cxx_Cmnt_Irix fix
  */
 tSCC zCxx_Cmnt_IrixName[] =
      "Cxx_Cmnt_Irix";
@@ -536,7 +578,7 @@ const char* apzCxx_Cmnt_IrixPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  18 - Cxx_Cmnt_Sunos fix
+ *  Description  19 - Cxx_Cmnt_Sunos fix
  */
 tSCC zCxx_Cmnt_SunosName[] =
      "Cxx_Cmnt_Sunos";
@@ -558,7 +600,7 @@ const char* apzCxx_Cmnt_SunosPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  19 - Cxx_Cmnt_Vxworks fix
+ *  Description  20 - Cxx_Cmnt_Vxworks fix
  */
 tSCC zCxx_Cmnt_VxworksName[] =
      "Cxx_Cmnt_Vxworks";
@@ -587,7 +629,7 @@ const char* apzCxx_Cmnt_VxworksPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  20 - Ecd_Cursor fix
+ *  Description  21 - Ecd_Cursor fix
  */
 tSCC zEcd_CursorName[] =
      "Ecd_Cursor";
@@ -609,7 +651,7 @@ const char* apzEcd_CursorPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  21 - Else_Label fix
+ *  Description  22 - Else_Label fix
  */
 tSCC zElse_LabelName[] =
      "Else_Label";
@@ -643,7 +685,7 @@ const char* apzElse_LabelPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  22 - Endif_Label fix
+ *  Description  23 - Endif_Label fix
  */
 tSCC zEndif_LabelName[] =
      "Endif_Label";
@@ -656,7 +698,7 @@ tSCC zEndif_LabelName[] =
  *  content selection pattern
  */
 tSCC zEndif_LabelSelect0[] =
-       "^[ \t]*#[ \t]*endif[ \t]+[!-.0-~]";
+       "^[ \t]*#[ \t]*endif[ \t]+[!-.0-z{|}~]";
 
 #define    ENDIF_LABEL_TEST_CT  1
 tTestDesc aEndif_LabelTests[] = {
@@ -678,7 +720,7 @@ const char* apzEndif_LabelPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  23 - Hp_Inline fix
+ *  Description  24 - Hp_Inline fix
  */
 tSCC zHp_InlineName[] =
      "Hp_Inline";
@@ -708,7 +750,7 @@ const char* apzHp_InlinePatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  24 - Hp_Sysfile fix
+ *  Description  25 - Hp_Sysfile fix
  */
 tSCC zHp_SysfileName[] =
      "Hp_Sysfile";
@@ -737,7 +779,7 @@ const char* apzHp_SysfilePatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  25 - Hpux_Cxx_Unready fix
+ *  Description  26 - Hpux_Cxx_Unready fix
  */
 tSCC zHpux_Cxx_UnreadyName[] =
      "Hpux_Cxx_Unready";
@@ -745,7 +787,6 @@ tSCC zHpux_Cxx_UnreadyName[] =
  *  File name selection pattern
  */
 tSCC zHpux_Cxx_UnreadyList[] =
-        "|" "assert.h"
         "|" "sys/mman.h" "|";
 
 /*
@@ -775,7 +816,7 @@ const char* apzHpux_Cxx_UnreadyPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  26 - Hpux_Maxint fix
+ *  Description  27 - Hpux_Maxint fix
  */
 tSCC zHpux_MaxintName[] =
      "Hpux_Maxint";
@@ -799,7 +840,7 @@ const char* apzHpux_MaxintPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  27 - Hpux_Systime fix
+ *  Description  28 - Hpux_Systime fix
  */
 tSCC zHpux_SystimeName[] =
      "Hpux_Systime";
@@ -828,7 +869,7 @@ const char* apzHpux_SystimePatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  28 - Interactv_Add1 fix
+ *  Description  29 - Interactv_Add1 fix
  */
 tSCC zInteractv_Add1Name[] =
      "Interactv_Add1";
@@ -865,7 +906,7 @@ const char* apzInteractv_Add1Patch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  29 - Interactv_Add2 fix
+ *  Description  30 - Interactv_Add2 fix
  */
 tSCC zInteractv_Add2Name[] =
      "Interactv_Add2";
@@ -897,7 +938,7 @@ const char* apzInteractv_Add2Patch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  30 - Interactv_Add3 fix
+ *  Description  31 - Interactv_Add3 fix
  */
 tSCC zInteractv_Add3Name[] =
      "Interactv_Add3";
@@ -930,7 +971,7 @@ const char* apzInteractv_Add3Patch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  31 - Io_Def_Quotes fix
+ *  Description  32 - Io_Def_Quotes fix
  */
 tSCC zIo_Def_QuotesName[] =
      "Io_Def_Quotes";
@@ -960,7 +1001,7 @@ const char* apzIo_Def_QuotesPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  32 - Ioctl_Fix_Ctrl fix
+ *  Description  33 - Ioctl_Fix_Ctrl fix
  */
 tSCC zIoctl_Fix_CtrlName[] =
      "Ioctl_Fix_Ctrl";
@@ -992,7 +1033,7 @@ const char* apzIoctl_Fix_CtrlPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  33 - Ip_Missing_Semi fix
+ *  Description  34 - Ip_Missing_Semi fix
  */
 tSCC zIp_Missing_SemiName[] =
      "Ip_Missing_Semi";
@@ -1013,7 +1054,7 @@ const char* apzIp_Missing_SemiPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  34 - Irix_Bogus_Cxx_Cmnt fix
+ *  Description  35 - Irix_Bogus_Cxx_Cmnt fix
  */
 tSCC zIrix_Bogus_Cxx_CmntName[] =
      "Irix_Bogus_Cxx_Cmnt";
@@ -1035,7 +1076,7 @@ const char* apzIrix_Bogus_Cxx_CmntPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  35 - Irix_Multiline_Cmnt fix
+ *  Description  36 - Irix_Multiline_Cmnt fix
  */
 tSCC zIrix_Multiline_CmntName[] =
      "Irix_Multiline_Cmnt";
@@ -1057,7 +1098,7 @@ const char* apzIrix_Multiline_CmntPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  36 - Irix_Sockaddr fix
+ *  Description  37 - Irix_Sockaddr fix
  */
 tSCC zIrix_SockaddrName[] =
      "Irix_Sockaddr";
@@ -1087,7 +1128,7 @@ const char* apzIrix_SockaddrPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  37 - Irix_Struct__File fix
+ *  Description  38 - Irix_Struct__File fix
  */
 tSCC zIrix_Struct__FileName[] =
      "Irix_Struct__File";
@@ -1109,7 +1150,7 @@ const char* apzIrix_Struct__FilePatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  38 - Isc_Fmod fix
+ *  Description  39 - Isc_Fmod fix
  */
 tSCC zIsc_FmodName[] =
      "Isc_Fmod";
@@ -1138,7 +1179,30 @@ const char* apzIsc_FmodPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  39 - Isc_Sys_Limits fix
+ *  Description  40 - Motorola_Nested fix
+ */
+tSCC zMotorola_NestedName[] =
+     "Motorola_Nested";
+/*
+ *  File name selection pattern
+ */
+tSCC zMotorola_NestedList[] =
+        "|" "limits.h"
+        "|" "sys/limits.h" "|";
+#define MOTOROLA_NESTED_TEST_CT  0
+#define aMotorola_NestedTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Motorola_Nested
+ */
+const char* apzMotorola_NestedPatch[] = { "sed",
+    "-e" "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*/\\* max # bytes atomic in write to a\\)$@\\1 */@",
+    "-e" "s@\\(/\\*#define\tHUGE_VAL\t3.40282346638528860e+38 \\)\\(/\\*error value returned by Math lib\\*/\\)$@\\1*/ \\2@",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description  41 - Isc_Sys_Limits fix
  */
 tSCC zIsc_Sys_LimitsName[] =
      "Isc_Sys_Limits";
@@ -1168,7 +1232,7 @@ const char* apzIsc_Sys_LimitsPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  40 - Kandr_Concat fix
+ *  Description  42 - Kandr_Concat fix
  */
 tSCC zKandr_ConcatName[] =
      "Kandr_Concat";
@@ -1214,7 +1278,7 @@ const char* apzKandr_ConcatPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  41 - Limits_Ifndefs fix
+ *  Description  43 - Limits_Ifndefs fix
  */
 tSCC zLimits_IfndefsName[] =
      "Limits_Ifndefs";
@@ -1262,11 +1326,12 @@ const char* apzLimits_IfndefsPatch[] = { "sed",
        "#ifndef DBL_DIG\n",
     "-e" "/[ \t]DBL_DIG[ \t]/a\\\n"
        "#endif\n",
+    "-e" "/^\\(\\/\\*#define\tHUGE_VAL\t3\\.[0-9e+]* *\\)\\/\\*/s//\\1/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  42 - Lynx_Void_Int fix
+ *  Description  44 - Lynx_Void_Int fix
  */
 tSCC zLynx_Void_IntName[] =
      "Lynx_Void_Int";
@@ -1295,7 +1360,7 @@ const char* apzLynx_Void_IntPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  43 - Lynxos_Fcntl_Proto fix
+ *  Description  45 - Lynxos_Fcntl_Proto fix
  */
 tSCC zLynxos_Fcntl_ProtoName[] =
      "Lynxos_Fcntl_Proto";
@@ -1316,7 +1381,7 @@ const char* apzLynxos_Fcntl_ProtoPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  44 - M88k_Bad_Hypot_Opt fix
+ *  Description  46 - M88k_Bad_Hypot_Opt fix
  */
 tSCC zM88k_Bad_Hypot_OptName[] =
      "M88k_Bad_Hypot_Opt";
@@ -1350,7 +1415,7 @@ const char* apzM88k_Bad_Hypot_OptPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  45 - M88k_Bad_S_If fix
+ *  Description  47 - M88k_Bad_S_If fix
  */
 tSCC zM88k_Bad_S_IfName[] =
      "M88k_Bad_S_If";
@@ -1380,7 +1445,7 @@ const char* apzM88k_Bad_S_IfPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  46 - M88k_Multi_Incl fix
+ *  Description  48 - M88k_Multi_Incl fix
  */
 tSCC zM88k_Multi_InclName[] =
      "M88k_Multi_Incl";
@@ -1417,7 +1482,7 @@ const char* apzM88k_Multi_InclPatch[] = { "sh", "-c",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  47 - Machine_Name fix
+ *  Description  49 - Machine_Name fix
  */
 tSCC zMachine_NameName[] =
      "Machine_Name";
@@ -1479,7 +1544,7 @@ const char* apzMachine_NamePatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  48 - Math_Exception fix
+ *  Description  50 - Math_Exception fix
  */
 tSCC zMath_ExceptionName[] =
      "Math_Exception";
@@ -1523,7 +1588,7 @@ const char* apzMath_ExceptionPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  49 - Math_Gcc_Ifndefs fix
+ *  Description  51 - Math_Gcc_Ifndefs fix
  */
 tSCC zMath_Gcc_IfndefsName[] =
      "Math_Gcc_Ifndefs";
@@ -1563,7 +1628,7 @@ const char* apzMath_Gcc_IfndefsPatch[] = { "sh", "-c",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  50 - Motorola_Stupid_Opt fix
+ *  Description  52 - Motorola_Stupid_Opt fix
  */
 tSCC zMotorola_Stupid_OptName[] =
      "Motorola_Stupid_Opt";
@@ -1604,7 +1669,7 @@ const char* apzMotorola_Stupid_OptPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  51 - Nested_Comment fix
+ *  Description  53 - Nested_Comment fix
  */
 tSCC zNested_CommentName[] =
      "Nested_Comment";
@@ -1625,7 +1690,7 @@ const char* apzNested_CommentPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  52 - News_Os_Recursion fix
+ *  Description  54 - News_Os_Recursion fix
  */
 tSCC zNews_Os_RecursionName[] =
      "News_Os_Recursion";
@@ -1657,7 +1722,7 @@ const char* apzNews_Os_RecursionPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  53 - Next_Math_Prefix fix
+ *  Description  55 - Next_Math_Prefix fix
  */
 tSCC zNext_Math_PrefixName[] =
      "Next_Math_Prefix";
@@ -1690,7 +1755,7 @@ const char* apzNext_Math_PrefixPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  54 - Next_Template fix
+ *  Description  56 - Next_Template fix
  */
 tSCC zNext_TemplateName[] =
      "Next_Template";
@@ -1720,7 +1785,7 @@ const char* apzNext_TemplatePatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  55 - Next_Volitile fix
+ *  Description  57 - Next_Volitile fix
  */
 tSCC zNext_VolitileName[] =
      "Next_Volitile";
@@ -1750,7 +1815,7 @@ const char* apzNext_VolitilePatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  56 - Next_Wait_Union fix
+ *  Description  58 - Next_Wait_Union fix
  */
 tSCC zNext_Wait_UnionName[] =
      "Next_Wait_Union";
@@ -1779,7 +1844,7 @@ const char* apzNext_Wait_UnionPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  57 - No_Double_Slash fix
+ *  Description  59 - No_Double_Slash fix
  */
 tSCC zNo_Double_SlashName[] =
      "No_Double_Slash";
@@ -1798,7 +1863,7 @@ tSCC zNo_Double_SlashSelect0[] =
  *  content test pattern.  A shell will deal with it later.
  */
 tSCC zNo_Double_SlashTest0[] =
-       "-z \"`echo ${f}|grep ++`\"";
+       "-z \"`echo ${file}|egrep '++|\\.hh$|\\.H$'`\"";
 
 #define    NO_DOUBLE_SLASH_TEST_CT  2
 tTestDesc aNo_Double_SlashTests[] = {
@@ -1814,7 +1879,7 @@ const char* apzNo_Double_SlashPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  58 - Nodeent_Syntax fix
+ *  Description  60 - Nodeent_Syntax fix
  */
 tSCC zNodeent_SyntaxName[] =
      "Nodeent_Syntax";
@@ -1835,7 +1900,7 @@ const char* apzNodeent_SyntaxPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  59 - Osf_Namespace_A fix
+ *  Description  61 - Osf_Namespace_A fix
  */
 tSCC zOsf_Namespace_AName[] =
      "Osf_Namespace_A";
@@ -1867,7 +1932,7 @@ const char* apzOsf_Namespace_APatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  60 - Osf_Namespace_B fix
+ *  Description  62 - Osf_Namespace_B fix
  */
 tSCC zOsf_Namespace_BName[] =
      "Osf_Namespace_B";
@@ -1899,7 +1964,7 @@ const char* apzOsf_Namespace_BPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  61 - Pthread_Page_Size fix
+ *  Description  63 - Pthread_Page_Size fix
  */
 tSCC zPthread_Page_SizeName[] =
      "Pthread_Page_Size";
@@ -1928,7 +1993,7 @@ const char* apzPthread_Page_SizePatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  62 - Rs6000_Double fix
+ *  Description  64 - Rs6000_Double fix
  */
 tSCC zRs6000_DoubleName[] =
      "Rs6000_Double";
@@ -1960,7 +2025,7 @@ const char* apzRs6000_DoublePatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  63 - Rs6000_Fchmod fix
+ *  Description  65 - Rs6000_Fchmod fix
  */
 tSCC zRs6000_FchmodName[] =
      "Rs6000_Fchmod";
@@ -1989,7 +2054,7 @@ const char* apzRs6000_FchmodPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  64 - Rs6000_Param fix
+ *  Description  66 - Rs6000_Param fix
  */
 tSCC zRs6000_ParamName[] =
      "Rs6000_Param";
@@ -2011,7 +2076,7 @@ const char* apzRs6000_ParamPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  65 - Sony_Include fix
+ *  Description  67 - Sony_Include fix
  */
 tSCC zSony_IncludeName[] =
      "Sony_Include";
@@ -2040,7 +2105,7 @@ const char* apzSony_IncludePatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  66 - Statsswtch fix
+ *  Description  68 - Statsswtch fix
  */
 tSCC zStatsswtchName[] =
      "Statsswtch";
@@ -2069,7 +2134,7 @@ const char* apzStatsswtchPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  67 - Stdio_Va_List fix
+ *  Description  69 - Stdio_Va_List fix
  */
 tSCC zStdio_Va_ListName[] =
      "Stdio_Va_List";
@@ -2107,7 +2172,7 @@ const char* apzStdio_Va_ListPatch[] = { "sh", "-c",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  68 - Sun_Bogus_Ifdef fix
+ *  Description  70 - Sun_Bogus_Ifdef fix
  */
 tSCC zSun_Bogus_IfdefName[] =
      "Sun_Bogus_Ifdef";
@@ -2137,7 +2202,7 @@ const char* apzSun_Bogus_IfdefPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  69 - Sun_Bogus_Ifdef_Sun4c fix
+ *  Description  71 - Sun_Bogus_Ifdef_Sun4c fix
  */
 tSCC zSun_Bogus_Ifdef_Sun4cName[] =
      "Sun_Bogus_Ifdef_Sun4c";
@@ -2166,7 +2231,7 @@ const char* apzSun_Bogus_Ifdef_Sun4cPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  70 - Sun_Catmacro fix
+ *  Description  72 - Sun_Catmacro fix
  */
 tSCC zSun_CatmacroName[] =
      "Sun_Catmacro";
@@ -2200,7 +2265,7 @@ const char* apzSun_CatmacroPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  71 - Sun_Malloc fix
+ *  Description  73 - Sun_Malloc fix
  */
 tSCC zSun_MallocName[] =
      "Sun_Malloc";
@@ -2224,7 +2289,7 @@ const char* apzSun_MallocPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  72 - Sun_Memcpy fix
+ *  Description  74 - Sun_Memcpy fix
  */
 tSCC zSun_MemcpyName[] =
      "Sun_Memcpy";
@@ -2273,7 +2338,7 @@ const char* apzSun_MemcpyPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  73 - Sun_Rusers_Semi fix
+ *  Description  75 - Sun_Rusers_Semi fix
  */
 tSCC zSun_Rusers_SemiName[] =
      "Sun_Rusers_Semi";
@@ -2302,7 +2367,7 @@ const char* apzSun_Rusers_SemiPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  74 - Sun_Signal fix
+ *  Description  76 - Sun_Signal fix
  */
 tSCC zSun_SignalName[] =
      "Sun_Signal";
@@ -2337,7 +2402,7 @@ const char* apzSun_SignalPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  75 - Sun_Xdr_Proto fix
+ *  Description  77 - Sun_Xdr_Proto fix
  */
 tSCC zSun_Xdr_ProtoName[] =
      "Sun_Xdr_Proto";
@@ -2363,7 +2428,7 @@ const char* apzSun_Xdr_ProtoPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  76 - Sunos_Large_Macro fix
+ *  Description  78 - Sunos_Large_Macro fix
  */
 tSCC zSunos_Large_MacroName[] =
      "Sunos_Large_Macro";
@@ -2386,7 +2451,7 @@ const char* apzSunos_Large_MacroPatch[] = { "sh", "-c",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  77 - Sunos_Matherr_Decl fix
+ *  Description  79 - Sunos_Matherr_Decl fix
  */
 tSCC zSunos_Matherr_DeclName[] =
      "Sunos_Matherr_Decl";
@@ -2416,7 +2481,7 @@ const char* apzSunos_Matherr_DeclPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  78 - Sunos_Strlen fix
+ *  Description  80 - Sunos_Strlen fix
  */
 tSCC zSunos_StrlenName[] =
      "Sunos_Strlen";
@@ -2437,7 +2502,7 @@ const char* apzSunos_StrlenPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  79 - Systypes fix
+ *  Description  81 - Systypes fix
  */
 tSCC zSystypesName[] =
      "Systypes";
@@ -2495,7 +2560,7 @@ const char* apzSystypesPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  80 - Systypes_For_Aix fix
+ *  Description  82 - Systypes_For_Aix fix
  */
 tSCC zSystypes_For_AixName[] =
      "Systypes_For_Aix";
@@ -2511,8 +2576,15 @@ tSCC zSystypes_For_AixList[] =
 tSCC zSystypes_For_AixSelect0[] =
        "typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t";
 
-#define    SYSTYPES_FOR_AIX_TEST_CT  1
+/*
+ *  content bypass pattern
+ */
+tSCC zSystypes_For_AixBypass0[] =
+       "_GCC_SIZE_T";
+
+#define    SYSTYPES_FOR_AIX_TEST_CT  2
 tTestDesc aSystypes_For_AixTests[] = {
+    { TT_NEGREP, zSystypes_For_AixBypass0, (regex_t*)NULL },
     { TT_EGREP,  zSystypes_For_AixSelect0, (regex_t*)NULL } };
 
 /*
@@ -2528,7 +2600,7 @@ const char* apzSystypes_For_AixPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  81 - Sysv68_String fix
+ *  Description  83 - Sysv68_String fix
  */
 tSCC zSysv68_StringName[] =
      "Sysv68_String";
@@ -2559,7 +2631,7 @@ const char* apzSysv68_StringPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  82 - Sysz_Stdlib_For_Sun fix
+ *  Description  84 - Sysz_Stdlib_For_Sun fix
  */
 tSCC zSysz_Stdlib_For_SunName[] =
      "Sysz_Stdlib_For_Sun";
@@ -2590,7 +2662,7 @@ const char* apzSysz_Stdlib_For_SunPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  83 - Sysz_Stdtypes_For_Sun fix
+ *  Description  85 - Sysz_Stdtypes_For_Sun fix
  */
 tSCC zSysz_Stdtypes_For_SunName[] =
      "Sysz_Stdtypes_For_Sun";
@@ -2625,7 +2697,7 @@ const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  84 - Tinfo_Cplusplus fix
+ *  Description  86 - Tinfo_Cplusplus fix
  */
 tSCC zTinfo_CplusplusName[] =
      "Tinfo_Cplusplus";
@@ -2646,7 +2718,7 @@ const char* apzTinfo_CplusplusPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  85 - Ultrix_Ansi_Compat fix
+ *  Description  87 - Ultrix_Ansi_Compat fix
  */
 tSCC zUltrix_Ansi_CompatName[] =
      "Ultrix_Ansi_Compat";
@@ -2677,7 +2749,7 @@ const char* apzUltrix_Ansi_CompatPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  86 - Ultrix_Atof_Param fix
+ *  Description  88 - Ultrix_Atof_Param fix
  */
 tSCC zUltrix_Atof_ParamName[] =
      "Ultrix_Atof_Param";
@@ -2702,7 +2774,7 @@ const char* apzUltrix_Atof_ParamPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  87 - Ultrix_Const fix
+ *  Description  89 - Ultrix_Const fix
  */
 tSCC zUltrix_ConstName[] =
      "Ultrix_Const";
@@ -2731,7 +2803,7 @@ const char* apzUltrix_ConstPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  88 - Ultrix_Ifdef fix
+ *  Description  90 - Ultrix_Ifdef fix
  */
 tSCC zUltrix_IfdefName[] =
      "Ultrix_Ifdef";
@@ -2760,7 +2832,7 @@ const char* apzUltrix_IfdefPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  89 - Ultrix_Nested_Cmnt fix
+ *  Description  91 - Ultrix_Nested_Cmnt fix
  */
 tSCC zUltrix_Nested_CmntName[] =
      "Ultrix_Nested_Cmnt";
@@ -2781,7 +2853,7 @@ const char* apzUltrix_Nested_CmntPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  90 - Ultrix_Static fix
+ *  Description  92 - Ultrix_Static fix
  */
 tSCC zUltrix_StaticName[] =
      "Ultrix_Static";
@@ -2812,7 +2884,7 @@ const char* apzUltrix_StaticPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  91 - Undefine_Null fix
+ *  Description  93 - Undefine_Null fix
  */
 tSCC zUndefine_NullName[] =
      "Undefine_Null";
@@ -2848,7 +2920,7 @@ const char* apzUndefine_NullPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  92 - Va_I960_Macro fix
+ *  Description  94 - Va_I960_Macro fix
  */
 tSCC zVa_I960_MacroName[] =
      "Va_I960_Macro";
@@ -2880,7 +2952,7 @@ const char* apzVa_I960_MacroPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  93 - Void_Null fix
+ *  Description  95 - Void_Null fix
  */
 tSCC zVoid_NullName[] =
      "Void_Null";
@@ -2919,7 +2991,7 @@ const char* apzVoid_NullPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  94 - Vxworks_Gcc_Problem fix
+ *  Description  96 - Vxworks_Gcc_Problem fix
  */
 tSCC zVxworks_Gcc_ProblemName[] =
      "Vxworks_Gcc_Problem";
@@ -2963,7 +3035,7 @@ const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  95 - Vxworks_Needs_Vxtypes fix
+ *  Description  97 - Vxworks_Needs_Vxtypes fix
  */
 tSCC zVxworks_Needs_VxtypesName[] =
      "Vxworks_Needs_Vxtypes";
@@ -2992,7 +3064,7 @@ const char* apzVxworks_Needs_VxtypesPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  96 - Vxworks_Needs_Vxworks fix
+ *  Description  98 - Vxworks_Needs_Vxworks fix
  */
 tSCC zVxworks_Needs_VxworksName[] =
      "Vxworks_Needs_Vxworks";
@@ -3035,7 +3107,7 @@ const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  97 - Vxworks_Time fix
+ *  Description  99 - Vxworks_Time fix
  */
 tSCC zVxworks_TimeName[] =
      "Vxworks_Time";
@@ -3080,7 +3152,7 @@ const char* apzVxworks_TimePatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  98 - X11_Class fix
+ *  Description 100 - X11_Class fix
  */
 tSCC zX11_ClassName[] =
      "X11_Class";
@@ -3104,17 +3176,17 @@ tTestDesc aX11_ClassTests[] = {
  *  Fix Command Arguments for X11_Class
  */
 const char* apzX11_ClassPatch[] = { "sed",
-    "-e" "/char [*]class;/i\\\n"
+    "-e" "/char \\*class;/i\\\n"
        "#ifdef __cplusplus\\\n"
        "\tchar *c_class;\\\n"
        "#else\n",
-    "-e" "/char [*]class;/a\\\n"
+    "-e" "/char \\*class;/a\\\n"
        "#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description  99 - X11_Class_Usage fix
+ *  Description 101 - X11_Class_Usage fix
  */
 tSCC zX11_Class_UsageName[] =
      "X11_Class_Usage";
@@ -3143,7 +3215,7 @@ const char* apzX11_Class_UsagePatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description 100 - X11_New fix
+ *  Description 102 - X11_New fix
  */
 tSCC zX11_NewName[] =
      "X11_New";
@@ -3178,7 +3250,7 @@ const char* apzX11_NewPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description 101 - X11_Sprintf fix
+ *  Description 103 - X11_Sprintf fix
  */
 tSCC zX11_SprintfName[] =
      "X11_Sprintf";
@@ -3201,11 +3273,166 @@ const char* apzX11_SprintfPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description 104 - Zzz_Ki_Iface fix
+ */
+tSCC zZzz_Ki_IfaceName[] =
+     "Zzz_Ki_Iface";
+/*
+ *  File name selection pattern
+ */
+tSCC zZzz_Ki_IfaceList[] =
+        "|" "sys/ki_iface.h" "|";
+
+/*
+ *  content selection pattern
+ */
+tSCC zZzz_Ki_IfaceSelect0[] =
+       "These definitions are for HP Internal developers";
+
+#define    ZZZ_KI_IFACE_TEST_CT  1
+tTestDesc aZzz_Ki_IfaceTests[] = {
+    { TT_EGREP,  zZzz_Ki_IfaceSelect0, (regex_t*)NULL } };
+
+/*
+ *  Fix Command Arguments for Zzz_Ki_Iface
+ */
+const char* apzZzz_Ki_IfacePatch[] = { "sh", "-c",
+    "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+       "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
+       "cat > /dev/null",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description 105 - Zzz_Ki fix
+ */
+tSCC zZzz_KiName[] =
+     "Zzz_Ki";
+/*
+ *  File name selection pattern
+ */
+tSCC zZzz_KiList[] =
+        "|" "sys/ki.h" "|";
+
+/*
+ *  content selection pattern
+ */
+tSCC zZzz_KiSelect0[] =
+       "11.00 HP-UX LP64";
+
+#define    ZZZ_KI_TEST_CT  1
+tTestDesc aZzz_KiTests[] = {
+    { TT_EGREP,  zZzz_KiSelect0, (regex_t*)NULL } };
+
+/*
+ *  Fix Command Arguments for Zzz_Ki
+ */
+const char* apzZzz_KiPatch[] = { "sh", "-c",
+    "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+       "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
+       "cat > /dev/null",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description 106 - Zzz_Ki_Calls fix
+ */
+tSCC zZzz_Ki_CallsName[] =
+     "Zzz_Ki_Calls";
+/*
+ *  File name selection pattern
+ */
+tSCC zZzz_Ki_CallsList[] =
+        "|" "sys/ki_calls.h" "|";
+
+/*
+ *  content selection pattern
+ */
+tSCC zZzz_Ki_CallsSelect0[] =
+       "KI_MAX_PROCS is an arbitrary number";
+
+#define    ZZZ_KI_CALLS_TEST_CT  1
+tTestDesc aZzz_Ki_CallsTests[] = {
+    { TT_EGREP,  zZzz_Ki_CallsSelect0, (regex_t*)NULL } };
+
+/*
+ *  Fix Command Arguments for Zzz_Ki_Calls
+ */
+const char* apzZzz_Ki_CallsPatch[] = { "sh", "-c",
+    "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+       "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
+       "cat > /dev/null",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description 107 - Zzz_Ki_Defs fix
+ */
+tSCC zZzz_Ki_DefsName[] =
+     "Zzz_Ki_Defs";
+/*
+ *  File name selection pattern
+ */
+tSCC zZzz_Ki_DefsList[] =
+        "|" "sys/ki_defs.h" "|";
+
+/*
+ *  content selection pattern
+ */
+tSCC zZzz_Ki_DefsSelect0[] =
+       "Kernel Instrumentation Definitions";
+
+#define    ZZZ_KI_DEFS_TEST_CT  1
+tTestDesc aZzz_Ki_DefsTests[] = {
+    { TT_EGREP,  zZzz_Ki_DefsSelect0, (regex_t*)NULL } };
+
+/*
+ *  Fix Command Arguments for Zzz_Ki_Defs
+ */
+const char* apzZzz_Ki_DefsPatch[] = { "sh", "-c",
+    "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+       "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
+       "cat > /dev/null",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description 108 - Zzz_Time fix
+ */
+tSCC zZzz_TimeName[] =
+     "Zzz_Time";
+/*
+ *  File name selection pattern
+ */
+tSCC zZzz_TimeList[] =
+        "|" "sys/time.h" "|";
+
+/*
+ *  content selection pattern
+ */
+tSCC zZzz_TimeSelect0[] =
+       "For CASPEC, look in";
+
+#define    ZZZ_TIME_TEST_CT  1
+tTestDesc aZzz_TimeTests[] = {
+    { TT_EGREP,  zZzz_TimeSelect0, (regex_t*)NULL } };
+
+/*
+ *  Fix Command Arguments for Zzz_Time
+ */
+const char* apzZzz_TimePatch[] = { "sh", "-c",
+    "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+       "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
+       "cat > /dev/null",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  List of all fixes
  */
-#define  REGEX_COUNT  69
-#define  FIX_COUNT    101
-tFixDesc fixDescList[ 101 ] = {
+#define  REGEX_COUNT  76
+#define  FIX_COUNT    108
+tFixDesc fixDescList[ 108 ] = {
   {  zAix_SyswaitName,    zAix_SyswaitList, (regex_t*)NULL,
      AIX_SYSWAIT_TEST_CT, aAix_SyswaitTests,
      apzAix_SyswaitPatch },
@@ -3254,6 +3481,10 @@ tFixDesc fixDescList[ 101 ] = {
      BADQUOTE_TEST_CT, aBadquoteTests,
      apzBadquotePatch },
 
+  {  zBad_LvalName,    zBad_LvalList, (regex_t*)NULL,
+     BAD_LVAL_TEST_CT, aBad_LvalTests,
+     apzBad_LvalPatch },
+
   {  zBroken_Assert_StdioName,    zBroken_Assert_StdioList, (regex_t*)NULL,
      BROKEN_ASSERT_STDIO_TEST_CT, aBroken_Assert_StdioTests,
      apzBroken_Assert_StdioPatch },
@@ -3358,6 +3589,10 @@ tFixDesc fixDescList[ 101 ] = {
      ISC_FMOD_TEST_CT, aIsc_FmodTests,
      apzIsc_FmodPatch },
 
+  {  zMotorola_NestedName,    zMotorola_NestedList, (regex_t*)NULL,
+     MOTOROLA_NESTED_TEST_CT, aMotorola_NestedTests,
+     apzMotorola_NestedPatch },
+
   {  zIsc_Sys_LimitsName,    zIsc_Sys_LimitsList, (regex_t*)NULL,
      ISC_SYS_LIMITS_TEST_CT, aIsc_Sys_LimitsTests,
      apzIsc_Sys_LimitsPatch },
@@ -3608,5 +3843,25 @@ tFixDesc fixDescList[ 101 ] = {
 
   {  zX11_SprintfName,    zX11_SprintfList, (regex_t*)NULL,
      X11_SPRINTF_TEST_CT, aX11_SprintfTests,
-     apzX11_SprintfPatch }
+     apzX11_SprintfPatch },
+
+  {  zZzz_Ki_IfaceName,    zZzz_Ki_IfaceList, (regex_t*)NULL,
+     ZZZ_KI_IFACE_TEST_CT, aZzz_Ki_IfaceTests,
+     apzZzz_Ki_IfacePatch },
+
+  {  zZzz_KiName,    zZzz_KiList, (regex_t*)NULL,
+     ZZZ_KI_TEST_CT, aZzz_KiTests,
+     apzZzz_KiPatch },
+
+  {  zZzz_Ki_CallsName,    zZzz_Ki_CallsList, (regex_t*)NULL,
+     ZZZ_KI_CALLS_TEST_CT, aZzz_Ki_CallsTests,
+     apzZzz_Ki_CallsPatch },
+
+  {  zZzz_Ki_DefsName,    zZzz_Ki_DefsList, (regex_t*)NULL,
+     ZZZ_KI_DEFS_TEST_CT, aZzz_Ki_DefsTests,
+     apzZzz_Ki_DefsPatch },
+
+  {  zZzz_TimeName,    zZzz_TimeList, (regex_t*)NULL,
+     ZZZ_TIME_TEST_CT, aZzz_TimeTests,
+     apzZzz_TimePatch }
 };
diff --git a/contrib/fixinc/inclhack.sh b/contrib/fixinc/inclhack.sh
index 2458373..a056e1b 100755
--- a/contrib/fixinc/inclhack.sh
+++ b/contrib/fixinc/inclhack.sh
@@ -2,7 +2,7 @@
 #
 # DO NOT EDIT THIS FILE   (inclhack.sh)
 # 
-# It has been autogen-ed  Thursday May 28, 1998 at 08:21:14 AM PDT
+# It has been autogen-ed  Tuesday June 02, 1998 at 06:45:50 AM PDT
 # From the definitions    inclhack.def
 # and the template file   inclhack.tpl
 #
@@ -10,7 +10,7 @@
 # files which are fixed to work correctly with ANSI C and placed in a
 # directory that GNU C will search.
 #
-# This script contains 101 fixup scripts.
+# This script contains 108 fixup scripts.
 #
 # See README-fixinc for more information.
 #
@@ -592,7 +592,41 @@ extern "C" {\
 
 
     #
-    # Fix  13:  Broken_Assert_Stdio
+    # Fix  13:  Bad_Lval
+    #
+    case "$file" in ./libgen.h | \
+	./dirent.h | \
+	./ftw.h | \
+	./grp.h | \
+	./ndbm.h | \
+	./pthread.h | \
+	./pwd.h | \
+	./signal.h | \
+	./standards.h | \
+	./stdlib.h | \
+	./string.h | \
+	./stropts.h | \
+	./time.h | \
+	./unistd.h )
+    if ( test -n "`egrep '^[ 	]*#[ 	]*pragma[ 	]extern_prefix' $file`"
+       ) > /dev/null 2>&1 ; then
+    fixlist="${fixlist}
+      bad_lval"
+    if [ ! -r ${DESTDIR}/$file ]
+    then infile=$file
+    else infile=${DESTDIR}/$file ; fi 
+
+    sed -e 's/^[ 	]*#[ 	]*define[ 	]*\([^(]*\)\(([^)]*)\)[ 	]*\(_.\)\1\2[ 	]*$/#define \1 \3\1/' \
+          < $infile > ${DESTDIR}/$file.
+    
+    mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+    fi # end of selection 'if'
+    ;; # case end for file name test
+    esac
+
+
+    #
+    # Fix  14:  Broken_Assert_Stdio
     #
     case "$file" in ./assert.h )
     if ( test -n "`egrep 'stderr' $file`" -a \
@@ -616,7 +650,7 @@ extern "C" {\
 
 
     #
-    # Fix  14:  Broken_Assert_Stdlib
+    # Fix  15:  Broken_Assert_Stdlib
     #
     case "$file" in ./assert.h )
     if ( test -n "`egrep 'exit *\\(|abort *\\(' $file`" -a \
@@ -642,7 +676,7 @@ extern "C" {\
 
 
     #
-    # Fix  15:  Bsd43_Io_Macros
+    # Fix  16:  Bsd43_Io_Macros
     #
     if ( test -n "`egrep 'BSD43__IO' $file`"
        ) > /dev/null 2>&1 ; then
@@ -661,7 +695,7 @@ extern "C" {\
 
 
     #
-    # Fix  16:  Cxx_Cmnt_Hpux
+    # Fix  17:  Cxx_Cmnt_Hpux
     #
     case "$file" in ./sys/pci.h )
     if ( test -n "`egrep 'System Private Structures' $file`"
@@ -682,7 +716,7 @@ extern "C" {\
 
 
     #
-    # Fix  17:  Cxx_Cmnt_Irix
+    # Fix  18:  Cxx_Cmnt_Irix
     #
     case "$file" in ./fam.h )
     if ( test -n "`egrep 'indigo.esd' $file`"
@@ -703,7 +737,7 @@ extern "C" {\
 
 
     #
-    # Fix  18:  Cxx_Cmnt_Sunos
+    # Fix  19:  Cxx_Cmnt_Sunos
     #
     case "$file" in ./sbusdev/audiovar.h | \
 	./sys/audiovar.h )
@@ -722,7 +756,7 @@ extern "C" {\
 
 
     #
-    # Fix  19:  Cxx_Cmnt_Vxworks
+    # Fix  20:  Cxx_Cmnt_Vxworks
     #
     case "$file" in ./drv/netif/if_med.h )
     if ( test -n "`egrep 'Wind River' $file`"
@@ -743,7 +777,7 @@ extern "C" {\
 
 
     #
-    # Fix  20:  Ecd_Cursor
+    # Fix  21:  Ecd_Cursor
     #
     case "$file" in ./sunwindow/win_lock.h | \
 	./sunwindow/win_cursor.h )
@@ -762,7 +796,7 @@ extern "C" {\
 
 
     #
-    # Fix  21:  Else_Label
+    # Fix  22:  Else_Label
     #
     if ( test -n "`egrep '^[ 	]*#[ 	]*else[ 	]+[!-.0-~]' $file`"
        ) > /dev/null 2>&1 ; then
@@ -786,9 +820,9 @@ s%^\([ 	]*#[ 	]*else\)[ 	]*[^/ 	].*%\1%' \
 
 
     #
-    # Fix  22:  Endif_Label
+    # Fix  23:  Endif_Label
     #
-    if ( test -n "`egrep '^[ 	]*#[ 	]*endif[ 	]+[!-.0-~]' $file`"
+    if ( test -n "`egrep '^[ 	]*#[ 	]*endif[ 	]+[!-.0-z{|}~]' $file`"
        ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}
       endif_label"
@@ -811,7 +845,7 @@ s%^\([ 	]*#[ 	]*endif\)[ 	]*[^/* 	].*%\1%' \
 
 
     #
-    # Fix  23:  Hp_Inline
+    # Fix  24:  Hp_Inline
     #
     case "$file" in ./sys/spinlock.h )
     if ( test -n "`egrep 'include.*\"\\.\\./machine/' $file`"
@@ -833,7 +867,7 @@ s%^\([ 	]*#[ 	]*endif\)[ 	]*[^/* 	].*%\1%' \
 
 
     #
-    # Fix  24:  Hp_Sysfile
+    # Fix  25:  Hp_Sysfile
     #
     case "$file" in ./sys/file.h )
     if ( test -n "`egrep 'HPUX_SOURCE' $file`"
@@ -854,10 +888,9 @@ s%^\([ 	]*#[ 	]*endif\)[ 	]*[^/* 	].*%\1%' \
 
 
     #
-    # Fix  25:  Hpux_Cxx_Unready
+    # Fix  26:  Hpux_Cxx_Unready
     #
-    case "$file" in ./assert.h | \
-	./sys/mman.h )
+    case "$file" in ./sys/mman.h )
     if ( test -z "`egrep '\"C\"|__BEGIN_DECLS' $file`"
        ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}
@@ -886,7 +919,7 @@ extern "C" {\
 
 
     #
-    # Fix  26:  Hpux_Maxint
+    # Fix  27:  Hpux_Maxint
     #
     case "$file" in ./sys/param.h )
     fixlist="${fixlist}
@@ -909,7 +942,7 @@ extern "C" {\
 
 
     #
-    # Fix  27:  Hpux_Systime
+    # Fix  28:  Hpux_Systime
     #
     case "$file" in ./sys/time.h )
     if ( test -n "`egrep '^extern struct sigevent;' $file`"
@@ -930,7 +963,7 @@ extern "C" {\
 
 
     #
-    # Fix  28:  Interactv_Add1
+    # Fix  29:  Interactv_Add1
     #
     case "$file" in ./stdio.h | \
 	./math.h | \
@@ -957,7 +990,7 @@ extern "C" {\
 
 
     #
-    # Fix  29:  Interactv_Add2
+    # Fix  30:  Interactv_Add2
     #
     case "$file" in ./math.h )
     if ( test '(' -d /etc/conf/kconfig.d ')' -a \
@@ -979,7 +1012,7 @@ extern "C" {\
 
 
     #
-    # Fix  30:  Interactv_Add3
+    # Fix  31:  Interactv_Add3
     #
     case "$file" in ./sys/limits.h )
     if ( test '(' -d /etc/conf/kconfig.d ')' -a \
@@ -1002,7 +1035,7 @@ extern "C" {\
 
 
     #
-    # Fix  31:  Io_Def_Quotes
+    # Fix  32:  Io_Def_Quotes
     #
     if ( test -n "`egrep '[ 	]_IO[A-Z]*[ 	]*\\([A-Za-z]' $file`"
        ) > /dev/null 2>&1 ; then
@@ -1022,7 +1055,7 @@ extern "C" {\
 
 
     #
-    # Fix  32:  Ioctl_Fix_Ctrl
+    # Fix  33:  Ioctl_Fix_Ctrl
     #
     if ( test -n "`egrep 'CTRL[ 	]' $file`"
        ) > /dev/null 2>&1 ; then
@@ -1044,7 +1077,7 @@ extern "C" {\
 
 
     #
-    # Fix  33:  Ip_Missing_Semi
+    # Fix  34:  Ip_Missing_Semi
     #
     case "$file" in ./netinet/ip.h )
     fixlist="${fixlist}
@@ -1062,7 +1095,7 @@ extern "C" {\
 
 
     #
-    # Fix  34:  Irix_Bogus_Cxx_Cmnt
+    # Fix  35:  Irix_Bogus_Cxx_Cmnt
     #
     case "$file" in ./elf_abi.h | \
 	./elf.h )
@@ -1081,7 +1114,7 @@ extern "C" {\
 
 
     #
-    # Fix  35:  Irix_Multiline_Cmnt
+    # Fix  36:  Irix_Multiline_Cmnt
     #
     case "$file" in ./sys/types.h )
     fixlist="${fixlist}
@@ -1100,7 +1133,7 @@ extern "C" {\
 
 
     #
-    # Fix  36:  Irix_Sockaddr
+    # Fix  37:  Irix_Sockaddr
     #
     case "$file" in ./rpc/auth.h )
     if ( test -n "`egrep 'authdes_create.*struct sockaddr' $file`"
@@ -1123,7 +1156,7 @@ struct sockaddr;
 
 
     #
-    # Fix  37:  Irix_Struct__File
+    # Fix  38:  Irix_Struct__File
     #
     case "$file" in ./rpc/xdr.h )
     fixlist="${fixlist}
@@ -1143,7 +1176,7 @@ struct __file_s;
 
 
     #
-    # Fix  38:  Isc_Fmod
+    # Fix  39:  Isc_Fmod
     #
     case "$file" in ./math.h )
     if ( test -n "`egrep 'fmod\\(double\\)' $file`"
@@ -1164,7 +1197,27 @@ struct __file_s;
 
 
     #
-    # Fix  39:  Isc_Sys_Limits
+    # Fix  40:  Motorola_Nested
+    #
+    case "$file" in ./limits.h | \
+	./sys/limits.h )
+    fixlist="${fixlist}
+      motorola_nested"
+    if [ ! -r ${DESTDIR}/$file ]
+    then infile=$file
+    else infile=${DESTDIR}/$file ; fi 
+
+    sed -e 's@^\(#undef[ 	][ 	]*PIPE_BUF[ 	]*/\* max # bytes atomic in write to a\)$@\1 */@' \
+        -e 's@\(/\*#define	HUGE_VAL	3.40282346638528860e+38 \)\(/\*error value returned by Math lib\*/\)$@\1*/ \2@' \
+          < $infile > ${DESTDIR}/$file.
+    
+    mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+    ;; # case end for file name test
+    esac
+
+
+    #
+    # Fix  41:  Isc_Sys_Limits
     #
     case "$file" in ./sys/limits.h )
     if ( test -n "`egrep 'CHILD_MAX' $file`"
@@ -1186,7 +1239,7 @@ struct __file_s;
 
 
     #
-    # Fix  40:  Kandr_Concat
+    # Fix  42:  Kandr_Concat
     #
     case "$file" in ./sparc/asm_linkage.h | \
 	./sun3/asm_linkage.h | \
@@ -1224,7 +1277,7 @@ struct __file_s;
 
 
     #
-    # Fix  41:  Limits_Ifndefs
+    # Fix  43:  Limits_Ifndefs
     #
     case "$file" in ./limits.h )
     if ( test -z "`egrep 'ifndef[ 	]+FLT_MIN' $file`"
@@ -1271,6 +1324,7 @@ struct __file_s;
         -e '/[ 	]DBL_DIG[ 	]/a\
 #endif
 ' \
+        -e '/^\(\/\*#define	HUGE_VAL	3\.[0-9e+]* *\)\/\*/s//\1/' \
           < $infile > ${DESTDIR}/$file.
     
     mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
@@ -1280,7 +1334,7 @@ struct __file_s;
 
 
     #
-    # Fix  42:  Lynx_Void_Int
+    # Fix  44:  Lynx_Void_Int
     #
     case "$file" in ./curses.h )
     if ( test -n "`egrep '#[ 	]*define[ 	]+void[ 	]+int' $file`"
@@ -1301,7 +1355,7 @@ struct __file_s;
 
 
     #
-    # Fix  43:  Lynxos_Fcntl_Proto
+    # Fix  45:  Lynxos_Fcntl_Proto
     #
     case "$file" in ./fcntl.h )
     fixlist="${fixlist}
@@ -1319,7 +1373,7 @@ struct __file_s;
 
 
     #
-    # Fix  44:  M88k_Bad_Hypot_Opt
+    # Fix  46:  M88k_Bad_Hypot_Opt
     #
     case "$file" in ./math.h )
     case "$target_canonical" in m88k-motorola-sysv3* )
@@ -1354,7 +1408,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  45:  M88k_Bad_S_If
+    # Fix  47:  M88k_Bad_S_If
     #
     case "$file" in ./sys/stat.h )
     case "$target_canonical" in m88k-*-sysv3* )
@@ -1379,7 +1433,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  46:  M88k_Multi_Incl
+    # Fix  48:  M88k_Multi_Incl
     #
     case "$file" in ./time.h )
     case "$target_canonical" in m88k-tektronix-sysv3* )
@@ -1415,7 +1469,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  47:  Machine_Name
+    # Fix  49:  Machine_Name
     #
     if ( test -n "`egrep '^#[ 	]*(if|elif).*[^a-zA-Z0-9_](_*[MSRrhim]|[Mbimnpstuv])[a-zA-Z0-9_]' $file`"
        ) > /dev/null 2>&1 ; then
@@ -1467,7 +1521,7 @@ s/\\+++fixinc_eol+++/\\/g
 
 
     #
-    # Fix  48:  Math_Exception
+    # Fix  50:  Math_Exception
     #
     case "$file" in ./math.h )
     if ( test -n "`egrep 'struct exception' $file`"
@@ -1507,7 +1561,7 @@ s/\\+++fixinc_eol+++/\\/g
 
 
     #
-    # Fix  49:  Math_Gcc_Ifndefs
+    # Fix  51:  Math_Gcc_Ifndefs
     #
     case "$file" in ./math.h )
     fixlist="${fixlist}
@@ -1548,7 +1602,7 @@ s/\\+++fixinc_eol+++/\\/g
 
 
     #
-    # Fix  50:  Motorola_Stupid_Opt
+    # Fix  52:  Motorola_Stupid_Opt
     #
     case "$file" in ./math.h )
     case "$target_canonical" in m88k-motorola-sysv3* )
@@ -1585,7 +1639,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  51:  Nested_Comment
+    # Fix  53:  Nested_Comment
     #
     case "$file" in ./rpc/rpc.h )
     fixlist="${fixlist}
@@ -1603,7 +1657,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  52:  News_Os_Recursion
+    # Fix  54:  News_Os_Recursion
     #
     case "$file" in ./stdlib.h )
     if ( test -n "`egrep '#include <stdlib.h>' $file`"
@@ -1629,7 +1683,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  53:  Next_Math_Prefix
+    # Fix  55:  Next_Math_Prefix
     #
     case "$file" in ./ansi/math.h )
     if ( test -n "`egrep '^extern.*double.*__const__.*' $file`"
@@ -1654,7 +1708,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  54:  Next_Template
+    # Fix  56:  Next_Template
     #
     case "$file" in ./bsd/libc.h )
     if ( test -n "`egrep 'template' $file`"
@@ -1676,7 +1730,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  55:  Next_Volitile
+    # Fix  57:  Next_Volitile
     #
     case "$file" in ./ansi/stdlib.h )
     if ( test -n "`egrep 'volatile' $file`"
@@ -1698,7 +1752,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  56:  Next_Wait_Union
+    # Fix  58:  Next_Wait_Union
     #
     case "$file" in ./sys/wait.h )
     if ( test -n "`egrep 'wait\\(union wait' $file`"
@@ -1719,10 +1773,10 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  57:  No_Double_Slash
+    # Fix  59:  No_Double_Slash
     #
     if ( test -n "`egrep '//[^*]' $file`" -a \
-              '(' -z "`echo ${f}|grep ++`" ')'
+              '(' -z "`echo ${file}|egrep '++|\.hh$|\.H$'`" ')'
        ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}
       no_double_slash"
@@ -1738,7 +1792,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  58:  Nodeent_Syntax
+    # Fix  60:  Nodeent_Syntax
     #
     case "$file" in ./netdnet/dnetdb.h )
     fixlist="${fixlist}
@@ -1756,7 +1810,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  59:  Osf_Namespace_A
+    # Fix  61:  Osf_Namespace_A
     #
     case "$file" in ./reg_types.h | \
 	./sys/lc_core.h )
@@ -1780,7 +1834,7 @@ static __inline__ double fake_hypot (x, y)\
 
 
     #
-    # Fix  60:  Osf_Namespace_B
+    # Fix  62:  Osf_Namespace_B
     #
     case "$file" in ./regex.h )
     if ( test '(' -r reg_types.h-a -r sys/lc_core.h-a -n "`grep '} regex_t;' reg_types.h`"-a -z "`grep __regex_t regex.h`" ')'
@@ -1805,7 +1859,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  61:  Pthread_Page_Size
+    # Fix  63:  Pthread_Page_Size
     #
     case "$file" in ./pthread.h )
     if ( test -n "`egrep '^int __page_size' $file`"
@@ -1826,7 +1880,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  62:  Rs6000_Double
+    # Fix  64:  Rs6000_Double
     #
     case "$file" in ./math.h )
     if ( test -n "`egrep '[^a-zA-Z_]class\\(' $file`"
@@ -1852,7 +1906,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  63:  Rs6000_Fchmod
+    # Fix  65:  Rs6000_Fchmod
     #
     case "$file" in ./sys/stat.h )
     if ( test -n "`egrep 'fchmod\\(char' $file`"
@@ -1873,7 +1927,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  64:  Rs6000_Param
+    # Fix  66:  Rs6000_Param
     #
     case "$file" in ./stdio.h | \
 	./unistd.h )
@@ -1892,7 +1946,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  65:  Sony_Include
+    # Fix  67:  Sony_Include
     #
     case "$file" in ./machine/machparam.h )
     if ( test -n "`egrep '\"\\.\\./machine/endian.h\"' $file`"
@@ -1913,7 +1967,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  66:  Statsswtch
+    # Fix  68:  Statsswtch
     #
     case "$file" in ./rpcsvc/rstat.h )
     if ( test -n "`egrep 'boottime$' $file`"
@@ -1934,7 +1988,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  67:  Stdio_Va_List
+    # Fix  69:  Stdio_Va_List
     #
     case "$file" in ./stdio.h )
     fixlist="${fixlist}
@@ -1973,7 +2027,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  68:  Sun_Bogus_Ifdef
+    # Fix  70:  Sun_Bogus_Ifdef
     #
     case "$file" in ./hsfs/hsfs_spec.h | \
 	./hsfs/iso_spec.h )
@@ -1995,7 +2049,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  69:  Sun_Bogus_Ifdef_Sun4c
+    # Fix  71:  Sun_Bogus_Ifdef_Sun4c
     #
     case "$file" in ./hsfs/hsnode.h )
     if ( test -n "`egrep '#ifdef __i386__ || __sun4c__' $file`"
@@ -2016,7 +2070,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  70:  Sun_Catmacro
+    # Fix  72:  Sun_Catmacro
     #
     case "$file" in ./pixrect/memvar.h )
     if ( test -n "`egrep '^#define[ 	]+CAT(a,b)' $file`"
@@ -2044,7 +2098,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  71:  Sun_Malloc
+    # Fix  73:  Sun_Malloc
     #
     case "$file" in ./malloc.h )
     fixlist="${fixlist}
@@ -2065,7 +2119,7 @@ typedef __regmatch_t	regmatch_t;
 
 
     #
-    # Fix  72:  Sun_Memcpy
+    # Fix  74:  Sun_Memcpy
     #
     case "$file" in ./memory.h )
     if ( test -n "`egrep '/\\*	@\\(#\\)(head/memory.h	50.1	 |memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2	)\\*/' $file`"
@@ -2107,7 +2161,7 @@ extern int memcmp();\
 
 
     #
-    # Fix  73:  Sun_Rusers_Semi
+    # Fix  75:  Sun_Rusers_Semi
     #
     case "$file" in ./rpcsvc/rusers.h )
     if ( test -n "`egrep '_cnt$' $file`"
@@ -2128,7 +2182,7 @@ extern int memcmp();\
 
 
     #
-    # Fix  74:  Sun_Signal
+    # Fix  76:  Sun_Signal
     #
     case "$file" in ./sys/signal.h | \
 	./signal.h )
@@ -2157,7 +2211,7 @@ void	(*signal(...))(...);\
 
 
     #
-    # Fix  75:  Sun_Xdr_Proto
+    # Fix  77:  Sun_Xdr_Proto
     #
     case "$file" in ./rpc/xdr.h )
     fixlist="${fixlist}
@@ -2180,7 +2234,7 @@ void	(*signal(...))(...);\
 
 
     #
-    # Fix  76:  Sunos_Large_Macro
+    # Fix  78:  Sunos_Large_Macro
     #
     case "$file" in ./sundev/ipi_error.h )
     fixlist="${fixlist}
@@ -2204,7 +2258,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file.
 
 
     #
-    # Fix  77:  Sunos_Matherr_Decl
+    # Fix  79:  Sunos_Matherr_Decl
     #
     case "$file" in ./math.h )
     if ( test '(' "`fgrep 'struct exception' $file | line`" != 'struct exception {' ')'
@@ -2227,7 +2281,7 @@ struct exception;
 
 
     #
-    # Fix  78:  Sunos_Strlen
+    # Fix  80:  Sunos_Strlen
     #
     case "$file" in ./strings.h )
     fixlist="${fixlist}
@@ -2245,7 +2299,7 @@ struct exception;
 
 
     #
-    # Fix  79:  Systypes
+    # Fix  81:  Systypes
     #
     case "$file" in ./sys/types.h | \
 	./stdlib.h | \
@@ -2299,10 +2353,11 @@ typedef __SIZE_TYPE__ size_t;\
 
 
     #
-    # Fix  80:  Systypes_For_Aix
+    # Fix  82:  Systypes_For_Aix
     #
     case "$file" in ./sys/types.h )
-    if ( test -n "`egrep 'typedef[ 	][ 	]*[A-Za-z_][ 	A-Za-z_]*[ 	]size_t' $file`"
+    if ( test -n "`egrep 'typedef[ 	][ 	]*[A-Za-z_][ 	A-Za-z_]*[ 	]size_t' $file`" -a \
+              -z "`egrep '_GCC_SIZE_T' $file`"
        ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}
       systypes_for_aix"
@@ -2326,7 +2381,7 @@ typedef __SIZE_TYPE__ size_t;\
 
 
     #
-    # Fix  81:  Sysv68_String
+    # Fix  83:  Sysv68_String
     #
     case "$file" in ./string.h )
     fixlist="${fixlist}
@@ -2354,7 +2409,7 @@ extern unsigned int\
 
 
     #
-    # Fix  82:  Sysz_Stdlib_For_Sun
+    # Fix  84:  Sysz_Stdlib_For_Sun
     #
     case "$file" in ./stdlib.h )
     case "$target_canonical" in *-sun-* | \
@@ -2388,7 +2443,7 @@ extern unsigned int\
 
 
     #
-    # Fix  83:  Sysz_Stdtypes_For_Sun
+    # Fix  85:  Sysz_Stdtypes_For_Sun
     #
     case "$file" in ./sys/stdtypes.h )
     fixlist="${fixlist}
@@ -2426,7 +2481,7 @@ extern unsigned int\
 
 
     #
-    # Fix  84:  Tinfo_Cplusplus
+    # Fix  86:  Tinfo_Cplusplus
     #
     case "$file" in ./tinfo.h )
     fixlist="${fixlist}
@@ -2444,7 +2499,7 @@ extern unsigned int\
 
 
     #
-    # Fix  85:  Ultrix_Ansi_Compat
+    # Fix  87:  Ultrix_Ansi_Compat
     #
     case "$file" in ./ansi_compat.h )
     if ( test -n "`egrep 'ULTRIX' $file`"
@@ -2468,7 +2523,7 @@ extern unsigned int\
 
 
     #
-    # Fix  86:  Ultrix_Atof_Param
+    # Fix  88:  Ultrix_Atof_Param
     #
     case "$file" in ./math.h )
     fixlist="${fixlist}
@@ -2490,7 +2545,7 @@ extern unsigned int\
 
 
     #
-    # Fix  87:  Ultrix_Const
+    # Fix  89:  Ultrix_Const
     #
     case "$file" in ./stdio.h )
     fixlist="${fixlist}
@@ -2516,7 +2571,7 @@ extern unsigned int\
 
 
     #
-    # Fix  88:  Ultrix_Ifdef
+    # Fix  90:  Ultrix_Ifdef
     #
     case "$file" in ./sys/file.h )
     if ( test -n "`egrep '#ifdef KERNEL' $file`"
@@ -2537,7 +2592,7 @@ extern unsigned int\
 
 
     #
-    # Fix  89:  Ultrix_Nested_Cmnt
+    # Fix  91:  Ultrix_Nested_Cmnt
     #
     case "$file" in ./rpc/svc.h )
     fixlist="${fixlist}
@@ -2555,7 +2610,7 @@ extern unsigned int\
 
 
     #
-    # Fix  90:  Ultrix_Static
+    # Fix  92:  Ultrix_Static
     #
     case "$file" in ./machine/cpu.h )
     if ( test -n "`egrep '#include \"r[34]_cpu' $file`"
@@ -2578,7 +2633,7 @@ extern unsigned int\
 
 
     #
-    # Fix  91:  Undefine_Null
+    # Fix  93:  Undefine_Null
     #
     if ( test -n "`egrep '^#[ 	]*define[ 	]*[ 	]NULL[ 	]' $file`" -a \
               -z "`egrep '#[ 	]*(ifn|un)def[ 	]*[ 	]NULL($|[ 	])' $file`"
@@ -2599,7 +2654,7 @@ extern unsigned int\
 
 
     #
-    # Fix  92:  Va_I960_Macro
+    # Fix  94:  Va_I960_Macro
     #
     case "$file" in ./arch/i960/archI960.h )
     if ( test -n "`egrep '__(vsiz|vali|vpad|alignof__)' $file`"
@@ -2623,7 +2678,7 @@ extern unsigned int\
 
 
     #
-    # Fix  93:  Void_Null
+    # Fix  95:  Void_Null
     #
     case "$file" in ./curses.h | \
 	./dbm.h | \
@@ -2654,7 +2709,7 @@ extern unsigned int\
 
 
     #
-    # Fix  94:  Vxworks_Gcc_Problem
+    # Fix  96:  Vxworks_Gcc_Problem
     #
     case "$file" in ./types/vxTypesBase.h )
     if ( test -n "`egrep '__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__' $file`"
@@ -2696,7 +2751,7 @@ extern unsigned int\
 
 
     #
-    # Fix  95:  Vxworks_Needs_Vxtypes
+    # Fix  97:  Vxworks_Needs_Vxtypes
     #
     case "$file" in ./time.h )
     if ( test -n "`egrep 'uint_t[ 	][ 	]*_clocks_per_sec' $file`"
@@ -2717,7 +2772,7 @@ extern unsigned int\
 
 
     #
-    # Fix  96:  Vxworks_Needs_Vxworks
+    # Fix  98:  Vxworks_Needs_Vxworks
     #
     case "$file" in ./sys/stat.h )
     if ( test -n "`egrep '#[ 	]define[ 	][ 	]*__INCstath' $file`" -a \
@@ -2743,7 +2798,7 @@ extern unsigned int\
 
 
     #
-    # Fix  97:  Vxworks_Time
+    # Fix  99:  Vxworks_Time
     #
     case "$file" in ./time.h )
     if ( test -n "`egrep 'VOIDFUNCPTR' $file`" -a \
@@ -2775,7 +2830,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
 
 
     #
-    # Fix  98:  X11_Class
+    # Fix 100:  X11_Class
     #
     case "$file" in ./X11/ShellP.h )
     if ( test -z "`egrep '__cplusplus' $file`"
@@ -2786,12 +2841,12 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
     then infile=$file
     else infile=${DESTDIR}/$file ; fi 
 
-    sed -e '/char [*]class;/i\
+    sed -e '/char \*class;/i\
 #ifdef __cplusplus\
 	char *c_class;\
 #else
 ' \
-        -e '/char [*]class;/a\
+        -e '/char \*class;/a\
 #endif
 ' \
           < $infile > ${DESTDIR}/$file.
@@ -2803,7 +2858,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
 
 
     #
-    # Fix  99:  X11_Class_Usage
+    # Fix 101:  X11_Class_Usage
     #
     case "$file" in ./Xm/BaseClassI.h )
     if ( test -z "`egrep '__cplusplus' $file`"
@@ -2824,7 +2879,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
 
 
     #
-    # Fix 100:  X11_New
+    # Fix 102:  X11_New
     #
     case "$file" in ./Xm/Traversal.h )
     if ( test -z "`egrep '__cplusplus' $file`"
@@ -2853,7 +2908,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
 
 
     #
-    # Fix 101:  X11_Sprintf
+    # Fix 103:  X11_Sprintf
     #
     case "$file" in ./X11*/Xmu.h )
     fixlist="${fixlist}
@@ -2870,6 +2925,141 @@ extern char *	sprintf();\
     mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
     ;; # case end for file name test
     esac
+
+
+    #
+    # Fix 104:  Zzz_Ki_Iface
+    #
+    case "$file" in ./sys/ki_iface.h )
+    if ( test -n "`egrep 'These definitions are for HP Internal developers' $file`"
+       ) > /dev/null 2>&1 ; then
+    fixlist="${fixlist}
+      zzz_ki_iface"
+    if [ ! -r ${DESTDIR}/$file ]
+    then infile=$file
+    else infile=${DESTDIR}/$file ; fi 
+    ( echo "Removing incorrect fix to HP-UX <$file>" >&2
+rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
+cat > /dev/null ) < $infile > ${DESTDIR}/$file.
+
+    #  Shell scripts have the potential of removing the output
+    #  We interpret that to mean the file is not to be altered
+    #
+    if test ! -f ${DESTDIR}/$file.
+    then continue ; fi 
+    
+    mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+    fi # end of selection 'if'
+    ;; # case end for file name test
+    esac
+
+
+    #
+    # Fix 105:  Zzz_Ki
+    #
+    case "$file" in ./sys/ki.h )
+    if ( test -n "`egrep '11.00 HP-UX LP64' $file`"
+       ) > /dev/null 2>&1 ; then
+    fixlist="${fixlist}
+      zzz_ki"
+    if [ ! -r ${DESTDIR}/$file ]
+    then infile=$file
+    else infile=${DESTDIR}/$file ; fi 
+    ( echo "Removing incorrect fix to HP-UX <$file>" >&2
+rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
+cat > /dev/null ) < $infile > ${DESTDIR}/$file.
+
+    #  Shell scripts have the potential of removing the output
+    #  We interpret that to mean the file is not to be altered
+    #
+    if test ! -f ${DESTDIR}/$file.
+    then continue ; fi 
+    
+    mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+    fi # end of selection 'if'
+    ;; # case end for file name test
+    esac
+
+
+    #
+    # Fix 106:  Zzz_Ki_Calls
+    #
+    case "$file" in ./sys/ki_calls.h )
+    if ( test -n "`egrep 'KI_MAX_PROCS is an arbitrary number' $file`"
+       ) > /dev/null 2>&1 ; then
+    fixlist="${fixlist}
+      zzz_ki_calls"
+    if [ ! -r ${DESTDIR}/$file ]
+    then infile=$file
+    else infile=${DESTDIR}/$file ; fi 
+    ( echo "Removing incorrect fix to HP-UX <$file>" >&2
+rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
+cat > /dev/null ) < $infile > ${DESTDIR}/$file.
+
+    #  Shell scripts have the potential of removing the output
+    #  We interpret that to mean the file is not to be altered
+    #
+    if test ! -f ${DESTDIR}/$file.
+    then continue ; fi 
+    
+    mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+    fi # end of selection 'if'
+    ;; # case end for file name test
+    esac
+
+
+    #
+    # Fix 107:  Zzz_Ki_Defs
+    #
+    case "$file" in ./sys/ki_defs.h )
+    if ( test -n "`egrep 'Kernel Instrumentation Definitions' $file`"
+       ) > /dev/null 2>&1 ; then
+    fixlist="${fixlist}
+      zzz_ki_defs"
+    if [ ! -r ${DESTDIR}/$file ]
+    then infile=$file
+    else infile=${DESTDIR}/$file ; fi 
+    ( echo "Removing incorrect fix to HP-UX <$file>" >&2
+rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
+cat > /dev/null ) < $infile > ${DESTDIR}/$file.
+
+    #  Shell scripts have the potential of removing the output
+    #  We interpret that to mean the file is not to be altered
+    #
+    if test ! -f ${DESTDIR}/$file.
+    then continue ; fi 
+    
+    mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+    fi # end of selection 'if'
+    ;; # case end for file name test
+    esac
+
+
+    #
+    # Fix 108:  Zzz_Time
+    #
+    case "$file" in ./sys/time.h )
+    if ( test -n "`egrep 'For CASPEC, look in' $file`"
+       ) > /dev/null 2>&1 ; then
+    fixlist="${fixlist}
+      zzz_time"
+    if [ ! -r ${DESTDIR}/$file ]
+    then infile=$file
+    else infile=${DESTDIR}/$file ; fi 
+    ( echo "Removing incorrect fix to HP-UX <$file>" >&2
+rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
+cat > /dev/null ) < $infile > ${DESTDIR}/$file.
+
+    #  Shell scripts have the potential of removing the output
+    #  We interpret that to mean the file is not to be altered
+    #
+    if test ! -f ${DESTDIR}/$file.
+    then continue ; fi 
+    
+    mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+    fi # end of selection 'if'
+    ;; # case end for file name test
+    esac
     #  IF the output has been removed OR it is unchanged,
     #  THEN ensure the output is gone
     #  ELSE look for local directory include syntax