inclhack.def (alpha___extern_prefix): Renamed to ...
[gcc.git] / gcc / fixinc / fixincl.x
index 526e599852eabc34f8b44d2ee78b8f50f992b9c6..94caee7dd60b530362d6f274f8cdc488abab9d45 100644 (file)
@@ -1,11 +1,21 @@
-/*
- *  DO NOT EDIT THIS FILE - it has been generated
+/*  -*- buffer-read-only: t -*- vi: set ro:
+ * 
+ * DO NOT EDIT THIS FILE   (fixincl.x)
+ * 
+ * It has been AutoGen-ed  Tuesday December 23, 2003 at 01:59:31 PM MET
+ * From the definitions    inclhack.def
+ * and the template file   fixincl
+ */
+/* DO NOT CVS-MERGE THIS FILE, EITHER Tue Dec 23 13:59:32 MET 2003
+ *
+ * You must regenerate it.  Use the ./genfixes script.
+ *
  *
- * Install modified versions of 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 is part of the fixincl program used to install modified versions of
+ * 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 139 fixup descriptions.
+ * This file contains 165 fixup descriptions.
  *
  * See README for more information.
  *
  *             Boston,  MA  02111-1307, USA.
  */
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aaa_Ki_Iface fix
- */
-#define AAA_KI_IFACE_FIXIDX              0
-tSCC zAaa_Ki_IfaceName[] =
-     "AAA_ki_iface";
-
-/*
- *  File name selection pattern
- */
-tSCC zAaa_Ki_IfaceList[] =
-  "|sys/ki_iface.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAaa_Ki_IfaceMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAaa_Ki_IfaceSelect0[] =
-       "These definitions are for HP Internal developers";
-
-#define    AAA_KI_IFACE_TEST_CT  1
-static tTestDesc aAaa_Ki_IfaceTests[] = {
-  { TT_EGREP,    zAaa_Ki_IfaceSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aaa_Ki_Iface
- */
-static const char* apzAaa_Ki_IfacePatch[] = {
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aaa_Ki fix
- */
-#define AAA_KI_FIXIDX                    1
-tSCC zAaa_KiName[] =
-     "AAA_ki";
-
-/*
- *  File name selection pattern
- */
-tSCC zAaa_KiList[] =
-  "|sys/ki.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAaa_KiMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAaa_KiSelect0[] =
-       "11.00 HP-UX LP64";
-
-#define    AAA_KI_TEST_CT  1
-static tTestDesc aAaa_KiTests[] = {
-  { TT_EGREP,    zAaa_KiSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aaa_Ki
- */
-static const char* apzAaa_KiPatch[] = {
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aaa_Ki_Calls fix
- */
-#define AAA_KI_CALLS_FIXIDX              2
-tSCC zAaa_Ki_CallsName[] =
-     "AAA_ki_calls";
-
-/*
- *  File name selection pattern
- */
-tSCC zAaa_Ki_CallsList[] =
-  "|sys/ki_calls.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAaa_Ki_CallsMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAaa_Ki_CallsSelect0[] =
-       "kthread_create_caller_t";
-
-#define    AAA_KI_CALLS_TEST_CT  1
-static tTestDesc aAaa_Ki_CallsTests[] = {
-  { TT_EGREP,    zAaa_Ki_CallsSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aaa_Ki_Calls
- */
-static const char* apzAaa_Ki_CallsPatch[] = {
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aaa_Ki_Defs fix
- */
-#define AAA_KI_DEFS_FIXIDX               3
-tSCC zAaa_Ki_DefsName[] =
-     "AAA_ki_defs";
-
-/*
- *  File name selection pattern
- */
-tSCC zAaa_Ki_DefsList[] =
-  "|sys/ki_defs.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAaa_Ki_DefsMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAaa_Ki_DefsSelect0[] =
-       "Kernel Instrumentation Definitions";
-
-#define    AAA_KI_DEFS_TEST_CT  1
-static tTestDesc aAaa_Ki_DefsTests[] = {
-  { TT_EGREP,    zAaa_Ki_DefsSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aaa_Ki_Defs
- */
-static const char* apzAaa_Ki_DefsPatch[] = {
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aaa_Standards fix
- */
-#define AAA_STANDARDS_FIXIDX             4
-tSCC zAaa_StandardsName[] =
-     "AAA_standards";
-
-/*
- *  File name selection pattern
- */
-tSCC zAaa_StandardsList[] =
-  "|standards.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAaa_StandardsMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAaa_StandardsSelect0[] =
-       "GNU and MIPS C compilers define __STDC__ differently";
-
-#define    AAA_STANDARDS_TEST_CT  1
-static tTestDesc aAaa_StandardsTests[] = {
-  { TT_EGREP,    zAaa_StandardsSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aaa_Standards
- */
-static const char* apzAaa_StandardsPatch[] = {
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aaa_Bad_Fixes fix
- */
-#define AAA_BAD_FIXES_FIXIDX             5
-tSCC zAaa_Bad_FixesName[] =
-     "AAA_bad_fixes";
-
-/*
- *  File name selection pattern
- */
-tSCC zAaa_Bad_FixesList[] =
-  "|sundev/ipi_error.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAaa_Bad_FixesMachs (const char**)NULL
-#define AAA_BAD_FIXES_TEST_CT  0
-#define aAaa_Bad_FixesTests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Aaa_Bad_Fixes
- */
-static const char* apzAaa_Bad_FixesPatch[] = {
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aaa_Time fix
- */
-#define AAA_TIME_FIXIDX                  6
-tSCC zAaa_TimeName[] =
-     "AAA_time";
-
-/*
- *  File name selection pattern
- */
-tSCC zAaa_TimeList[] =
-  "|sys/time.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAaa_TimeMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAaa_TimeSelect0[] =
-       "11.0 and later representation of ki time";
-
-#define    AAA_TIME_TEST_CT  1
-static tTestDesc aAaa_TimeTests[] = {
-  { TT_EGREP,    zAaa_TimeSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Aaa_Time
- */
-static const char* apzAaa_TimePatch[] = {
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aab_Dgux_Int_Varargs fix
- */
-#define AAB_DGUX_INT_VARARGS_FIXIDX      7
-tSCC zAab_Dgux_Int_VarargsName[] =
-     "AAB_dgux_int_varargs";
-
-/*
- *  File name selection pattern
- */
-tSCC zAab_Dgux_Int_VarargsList[] =
-  "|_int_varargs.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzAab_Dgux_Int_VarargsMachs (const char**)NULL
-#define AAB_DGUX_INT_VARARGS_TEST_CT  0
-#define aAab_Dgux_Int_VarargsTests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Aab_Dgux_Int_Varargs
- */
-static const char* apzAab_Dgux_Int_VarargsPatch[] = {
-"#ifndef __INT_VARARGS_H\n\
-#define __INT_VARARGS_H\n\n\
-/************************************************************************/\n\
-/* _INT_VARARGS.H - Define the common stuff for varargs/stdarg/stdio.   */\n\
-/************************************************************************/\n\n\
-/*\n\
-** This file is a DG internal header.  Never include this\n\
-** file directly.\n\
-*/\n\n\
-#ifndef ___int_features_h\n\
-#include <sys/_int_features.h>\n\
-#endif\n\n\
-#if !(defined(_VA_LIST) || defined(_VA_LIST_))\n\
-#define _VA_LIST\n\
-#define _VA_LIST_\n\n\
-#ifdef __LINT__\n\n\
-#ifdef __STDC__\n\
-typedef void * va_list;\n\
-#else\n\
-typedef char * va_list;\n\
-#endif\n\n\
-#else\n\
-#if _M88K_ANY\n\n\
-#if defined(__DCC__)\n\n\
-typedef struct {\n\
-      int     next_arg;\n\
-      int     *mem_ptr;\n\
-      int     *reg_ptr;\n\
-} va_list;\n\n\
-#else  /* ! defined(__DCC__) */\n\n\
-typedef struct {\n\
-      int  __va_arg;       /* argument number */\n\
-      int *__va_stk;       /* start of args passed on stack */\n\
-      int *__va_reg;       /* start of args passed in regs */\n\
-} va_list;\n\n\
-#endif  /* ! defined(__DCC__) */\n\n\
-#elif _IX86_ANY\n\n\
-#if defined(__GNUC__) || defined(__STDC__)\n\
-typedef void * va_list;\n\
-#else\n\
-typedef char * va_list;\n\
-#endif\n\n\
-#endif  /*  _IX86_ANY */\n\n\
-#endif /* __LINT__ */\n\
-#endif /*  !(defined(_VA_LIST) || defined(_VA_LIST_)) */\n\
-#endif /*  #ifndef __INT_VARARGS_H  */\n",
-    (char*)NULL };
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aab_Fd_Zero_Asm_Posix_Types_H fix
  */
-#define AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX 8
 tSCC zAab_Fd_Zero_Asm_Posix_Types_HName[] =
      "AAB_fd_zero_asm_posix_types_h";
 
@@ -376,21 +83,20 @@ static const char* apzAab_Fd_Zero_Asm_Posix_Types_HPatch[] = {
 #define __FD_ZERO(fdsetp) \\\n\
   do { \\\n\
     int __d0, __d1; \\\n\
-\t\t__asm__ __volatile__(\"cld ; rep ; stosl\" \\\n\
-\t\t\t: \"=&c\" (__d0), \"=&D\" (__d1) \\\n\
-\t\t\t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\
-\t\t\t  \"1\" ((__kernel_fd_set *) (fdsetp)) :\"memory\"); \\\n\
+__asm__ __volatile__(\"cld ; rep ; stosl\" \\\n\
+: \"=&c\" (__d0), \"=&D\" (__d1) \\\n\
+: \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\
+  \"1\" ((__kernel_fd_set *) (fdsetp)) :\"memory\"); \\\n\
   } while (0)\n\
 #endif\n\n\
 #define _POSIX_TYPES_H_WRAPPER\n\
-#endif /* _POSIX_TYPES_H_WRAPPER */\n",
+#endif /* _POSIX_TYPES_H_WRAPPER */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aab_Fd_Zero_Gnu_Types_H fix
  */
-#define AAB_FD_ZERO_GNU_TYPES_H_FIXIDX   9
 tSCC zAab_Fd_Zero_Gnu_Types_HName[] =
      "AAB_fd_zero_gnu_types_h";
 
@@ -415,27 +121,26 @@ static const char* apzAab_Fd_Zero_Gnu_Types_HPatch[] = {
 "/* This file fixes a bug in the __FD_ZERO macro present in glibc 1.x. */\n\
 #ifndef _TYPES_H_WRAPPER\n\
 #include <features.h>\n\
- #include_next <gnu/types.h>\n\n\
+#include_next <gnu/types.h>\n\n\
 #if defined(__FD_ZERO) && !defined(__GLIBC__)\n\
 #undef __FD_ZERO\n\
-# define __FD_ZERO(fdsetp) \\\n\
-  do { \\\n\
-    int __d0, __d1; \\\n\
-\t__asm__ __volatile__(\"cld ; rep ; stosl\" \\\n\
-        \t: \"=&c\" (__d0), \"=&D\" (__d1) \\\n\
-        \t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\
-\t\t  \"1\" ((__fd_set *) (fdsetp)) :\"memory\"); \\\n\
+# define __FD_ZERO(fdsetp) \\\\\n\
+  do { \\\\\n\
+    int __d0, __d1; \\\\\n\
+__asm__ __volatile__(\"cld ; rep ; stosl\" \\\\\n\
+        \t: \"=&c\" (__d0), \"=&D\" (__d1) \\\\\n\
+        \t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\\\n\
+  \"1\" ((__fd_set *) (fdsetp)) :\"memory\"); \\\\\n\
   } while (0)\n\
 #endif\n\n\
 #define _TYPES_H_WRAPPER\n\
-#endif /* _TYPES_H_WRAPPER */\n",
+#endif /* _TYPES_H_WRAPPER */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aab_Fd_Zero_Selectbits_H fix
  */
-#define AAB_FD_ZERO_SELECTBITS_H_FIXIDX  10
 tSCC zAab_Fd_Zero_Selectbits_HName[] =
      "AAB_fd_zero_selectbits_h";
 
@@ -459,32 +164,63 @@ tSCC* apzAab_Fd_Zero_Selectbits_HMachs[] = {
 static const char* apzAab_Fd_Zero_Selectbits_HPatch[] = {
 "/* This file fixes a bug in the __FD_ZERO macro present in glibc 2.0.x. */\n\
 #ifndef _SELECTBITS_H_WRAPPER\n\
-#include <features.h>\n\
- #include_next <selectbits.h>\n\n\
-#if defined(__FD_ZERO) && defined(__GLIBC__) \\\n\
-\t&& defined(__GLIBC_MINOR__) && __GLIBC__ == 2 \\\n\
-\t&& __GLIBC_MINOR__ == 0\n\
-#undef __FD_ZERO\n\
-#define __FD_ZERO(fdsetp) \\\n\
-  do { \\\n\
-    int __d0, __d1; \\\n\
-  __asm__ __volatile__ (\"cld; rep; stosl\" \\\n\
-                        : \"=&c\" (__d0), \"=&D\" (__d1) \\\n\
-                        : \"a\" (0), \"0\" (sizeof (__fd_set) \\\n\
-                                        / sizeof (__fd_mask)), \\\n\
-                          \"1\" ((__fd_mask *) (fdsetp)) \\\n\
-                        : \"memory\"); \\\n\
-  } while (0)\n\
-#endif\n\n\
-#define _SELECTBITS_H_WRAPPER\n\
-#endif /* _SELECTBITS_H_WRAPPER */\n",
+  #include <features.h>\n\
+  #include_next <selectbits.h>\n\n\
+  #if defined(__FD_ZERO) && defined(__GLIBC__) \\\\\n\
+  && defined(__GLIBC_MINOR__) && __GLIBC__ == 2 \\\\\n\
+  && __GLIBC_MINOR__ == 0\n\
+     #undef __FD_ZERO\n\
+     #define __FD_ZERO(fdsetp) \\\\\n\
+     do { \\\\\n\
+        int __d0, __d1; \\\\\n\
+      __asm__ __volatile__ (\"cld; rep; stosl\" \\\\\n\
+                        : \"=&c\" (__d0), \"=&D\" (__d1) \\\\\n\
+                        : \"a\" (0), \"0\" (sizeof (__fd_set) \\\\\n\
+                                        / sizeof (__fd_mask)), \\\\\n\
+                          \"1\" ((__fd_mask *) (fdsetp)) \\\\\n\
+                        : \"memory\"); \\\\\n\
+      } while (0)\n\
+  #endif\n\n\
+  #define _SELECTBITS_H_WRAPPER\n\
+#endif /* _SELECTBITS_H_WRAPPER */",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aab_Solaris_Sys_Varargs_H fix
+ */
+tSCC zAab_Solaris_Sys_Varargs_HName[] =
+     "AAB_solaris_sys_varargs_h";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAab_Solaris_Sys_Varargs_HList[] =
+  "|sys/varargs.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAab_Solaris_Sys_Varargs_HMachs[] = {
+        "*-*-solaris*",
+        (const char*)NULL };
+#define AAB_SOLARIS_SYS_VARARGS_H_TEST_CT  0
+#define aAab_Solaris_Sys_Varargs_HTests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Aab_Solaris_Sys_Varargs_H
+ */
+static const char* apzAab_Solaris_Sys_Varargs_HPatch[] = {
+"#ifdef __STDC__\n\
+  #include <stdarg.h>\n\
+#else\n\
+  #include <varargs.h>\n\
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aab_Sun_Memcpy fix
  */
-#define AAB_SUN_MEMCPY_FIXIDX            11
 tSCC zAab_Sun_MemcpyName[] =
      "AAB_sun_memcpy";
 
@@ -514,54 +250,59 @@ static tTestDesc aAab_Sun_MemcpyTests[] = {
 static const char* apzAab_Sun_MemcpyPatch[] = {
 "/* This file was generated by fixincludes */\n\
 #ifndef __memory_h__\n\
-#define __memory_h__\n\n\
-#ifdef __STDC__\n\
-extern void *memccpy();\n\
-extern void *memchr();\n\
-extern void *memcpy();\n\
-extern void *memset();\n\
-#else\n\
-extern char *memccpy();\n\
-extern char *memchr();\n\
-extern char *memcpy();\n\
-extern char *memset();\n\
-#endif /* __STDC__ */\n\n\
-extern int memcmp();\n\n\
-#endif /* __memory_h__ */\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Aab_Svr4_Replace_Byteorder fix
- */
-#define AAB_SVR4_REPLACE_BYTEORDER_FIXIDX 12
-tSCC zAab_Svr4_Replace_ByteorderName[] =
-     "AAB_svr4_replace_byteorder";
-
-/*
- *  File name selection pattern
- */
-tSCC zAab_Svr4_Replace_ByteorderList[] =
-  "|sys/byteorder.h|";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAab_Svr4_Replace_ByteorderMachs[] = {
-        "*-*-sysv4*",
-        "i[34567]86-*-sysv5*",
-        "i[34567]86-*-udk*",
-        "i[34567]86-*-solaris2.[0-4]",
-        "powerpcle-*-solaris2.[0-4]",
-        "sparc-*-solaris2.[0-4]",
-        (const char*)NULL };
-#define AAB_SVR4_REPLACE_BYTEORDER_TEST_CT  0
-#define aAab_Svr4_Replace_ByteorderTests   (tTestDesc*)NULL
-
-/*
- *  Fix Command Arguments for Aab_Svr4_Replace_Byteorder
- */
-static const char* apzAab_Svr4_Replace_ByteorderPatch[] = {
-"#ifndef _SYS_BYTEORDER_H\n\
+  #define __memory_h__\n\n\
+  #ifdef __STDC__\n\
+    extern void *memccpy();\n\
+    extern void *memchr();\n\
+    extern void *memcpy();\n\
+    extern void *memset();\n\
+  #else\n\
+    extern char *memccpy();\n\
+    extern char *memchr();\n\
+    extern char *memcpy();\n\
+    extern char *memset();\n\
+  #endif /* __STDC__ */\n\n\
+  extern int memcmp();\n\n\
+#endif /* __memory_h__ */\n\
+_EndOfHeader;\n\
+};\n\n\n\
+/*\n\
+ *  Completely replace <sys/varargs.h> with a file that includes gcc's\n\
+ *  stdarg.h or varargs.h files as appropriate.\n\
+ */\n\
+#ifdef SVR4\n\
+fix = {\n\
+    hackname = AAB_svr4_no_varargs;\n\
+    files    = sys/varargs.h;\n\
+    replace  = \"/* This file was generated by fixincludes.  */\\n\"\n\
+               \"#ifndef _SYS_VARARGS_H\\n\"\n\
+               \"#define _SYS_VARARGS_H\\n\\n\"\n\n\
+               \"#ifdef __STDC__\\n\"\n\
+               \"#include <stdarg.h>\\n\"\n\
+               \"#else\\n\"\n\
+               \"#include <varargs.h>\\n\"\n\
+               \"#endif\\n\\n\"\n\n\
+               \"#endif  /* _SYS_VARARGS_H */\\n\";\n\
+};\n\
+#endif\n\n\n\
+/*\n\
+ *  Completely replace <sys/byteorder.h> with a file that implements gcc's\n\
+ *  optimized byteswapping.  (The original probably implemented some\n\
+ *  incompatible optimized byteswapping.)\n\
+ */\n\
+fix = {\n\
+    hackname = AAB_svr4_replace_byteorder;\n\
+    mach     = \"*-*-sysv4*\";\n\
+    mach     = \"i[34567]86-*-sysv5*\";\n\
+    mach     = \"i[34567]86-*-sco3.2v5*\";\n\
+    mach     = \"i[34567]86-*-udk*\";\n\
+    mach     = \"i[34567]86-*-solaris2.[0-4]\";\n\
+    mach     = \"powerpcle-*-solaris2.[0-4]\";\n\
+    mach     = \"sparc-*-solaris2.[0-4]\";\n\
+    mach     = \"i[34567]86-sequent-ptx*\";\n\
+    files    = sys/byteorder.h;\n\
+    replace  = <<-  _EndOfHeader_\n\
+#ifndef _SYS_BYTEORDER_H\n\
 #define _SYS_BYTEORDER_H\n\n\
 /* Functions to convert `short' and `long' quantities from host byte order\n\
    to (internet) network byte order (i.e. big-endian).\n\n\
@@ -571,89 +312,87 @@ static const char* apzAab_Svr4_Replace_ByteorderPatch[] = {
    For little-endian machines, we define the functions using specialized\n\
    asm sequences in cases where doing so yields better code (e.g. i386).  */\n\n\
 #if !defined (__GNUC__) && !defined (__GNUG__)\n\
-#error You lose!  This file is only useful with GNU compilers.\n\
+  #error You lose!  This file is only useful with GNU compilers.\n\
 #endif\n\n\
 #ifndef __BYTE_ORDER__\n\
-/* Byte order defines.  These are as defined on UnixWare 1.1, but with\n\
-   double underscores added at the front and back.  */\n\
-#define __LITTLE_ENDIAN__   1234\n\
-#define __BIG_ENDIAN__      4321\n\
-#define __PDP_ENDIAN__      3412\n\
+  /* Byte order defines.  These are as defined on UnixWare 1.1, but with\n\
+     double underscores added at the front and back.  */\n\
+  #define __LITTLE_ENDIAN__   1234\n\
+  #define __BIG_ENDIAN__      4321\n\
+  #define __PDP_ENDIAN__      3412\n\
 #endif\n\n\
 #ifdef __STDC__\n\
-static __inline__ unsigned long htonl (unsigned long);\n\
-static __inline__ unsigned short htons (unsigned int);\n\
-static __inline__ unsigned long ntohl (unsigned long);\n\
-static __inline__ unsigned short ntohs (unsigned int);\n\
+  static __inline__ unsigned long htonl (unsigned long);\n\
+  static __inline__ unsigned short htons (unsigned int);\n\
+  static __inline__ unsigned long ntohl (unsigned long);\n\
+  static __inline__ unsigned short ntohs (unsigned int);\n\
 #endif /* defined (__STDC__) */\n\n\
 #if defined (__i386__)\n\n\
-#ifndef __BYTE_ORDER__\n\
-#define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\
-#endif\n\n\
-/* Convert a host long to a network long.  */\n\n\
-/* We must use a new-style function definition, so that this will also\n\
-   be valid for C++.  */\n\
-static __inline__ unsigned long\n\
-htonl (unsigned long __arg)\n\
-{\n\
-  register unsigned long __result;\n\n\
-  __asm__ (\"xchg%B0 %b0,%h0\n\
-\tror%L0 $16,%0\n\
-\txchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\
-  return __result;\n\
-}\n\n\
-/* Convert a host short to a network short.  */\n\n\
-static __inline__ unsigned short\n\
-htons (unsigned int __arg)\n\
-{\n\
-  register unsigned short __result;\n\n\
-  __asm__ (\"xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\
-  return __result;\n\
-}\n\n\
-#elif ((defined (__i860__) && !defined (__i860_big_endian__))\t\\\n\
-       || defined (__ns32k__) || defined (__vax__)\t\t\\\n\
-       || defined (__spur__) || defined (__arm__))\n\n\
-#ifndef __BYTE_ORDER__\n\
-#define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\
-#endif\n\n\
-/* For other little-endian machines, using C code is just as efficient as\n\
-   using assembly code.  */\n\n\
-/* Convert a host long to a network long.  */\n\n\
-static __inline__ unsigned long\n\
-htonl (unsigned long __arg)\n\
-{\n\
-  register unsigned long __result;\n\n\
-  __result = (__arg >> 24) & 0x000000ff;\n\
-  __result |= (__arg >> 8) & 0x0000ff00;\n\
-  __result |= (__arg << 8) & 0x00ff0000;\n\
-  __result |= (__arg << 24) & 0xff000000;\n\
-  return __result;\n\
-}\n\n\
-/* Convert a host short to a network short.  */\n\n\
-static __inline__ unsigned short\n\
-htons (unsigned int __arg)\n\
-{\n\
-  register unsigned short __result;\n\n\
-  __result = (__arg << 8) & 0xff00;\n\
-  __result |= (__arg >> 8) & 0x00ff;\n\
-  return __result;\n\
-}\n\n\
+  #ifndef __BYTE_ORDER__\n\
+    #define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\
+  #endif\n\n\
+  /* Convert a host long to a network long.  */\n\n\
+  /* We must use a new-style function definition, so that this will also\n\
+     be valid for C++.  */\n\
+  static __inline__ unsigned long\n\
+  htonl (unsigned long __arg)\n\
+  {\n\
+    register unsigned long __result;\n\n\
+    __asm__ (\"xchg%B0 %b0,%h0\n\
+  ror%L0 $16,%0\n\
+  xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\
+    return __result;\n\
+  }\n\n\
+  /* Convert a host short to a network short.  */\n\n\
+  static __inline__ unsigned short\n\
+  htons (unsigned int __arg)\n\
+  {\n\
+    register unsigned short __result;\n\n\
+    __asm__ (\"xchg%B0 %b0,%h0\" : \"=q\" (__result) : \"0\" (__arg));\n\
+    return __result;\n\
+  }\n\n\
+#elif (defined (__ns32k__) || defined (__vax__) || defined (__arm__))\n\n\
+  #ifndef __BYTE_ORDER__\n\
+    #define __BYTE_ORDER__ __LITTLE_ENDIAN__\n\
+  #endif\n\n\
+  /* For other little-endian machines, using C code is just as efficient as\n\
+     using assembly code.  */\n\n\
+  /* Convert a host long to a network long.  */\n\n\
+  static __inline__ unsigned long\n\
+  htonl (unsigned long __arg)\n\
+  {\n\
+    register unsigned long __result;\n\n\
+    __result = (__arg >> 24) & 0x000000ff;\n\
+    __result |= (__arg >> 8) & 0x0000ff00;\n\
+    __result |= (__arg << 8) & 0x00ff0000;\n\
+    __result |= (__arg << 24) & 0xff000000;\n\
+    return __result;\n\
+  }\n\n\
+  /* Convert a host short to a network short.  */\n\n\
+  static __inline__ unsigned short\n\
+  htons (unsigned int __arg)\n\
+  {\n\
+    register unsigned short __result;\n\n\
+    __result = (__arg << 8) & 0xff00;\n\
+    __result |= (__arg >> 8) & 0x00ff;\n\
+    return __result;\n\
+  }\n\n\
 #else /* must be a big-endian machine */\n\n\
-#ifndef __BYTE_ORDER__\n\
-#define __BYTE_ORDER__ __BIG_ENDIAN__\n\
-#endif\n\n\
-/* Convert a host long to a network long.  */\n\n\
-static __inline__ unsigned long\n\
-htonl (unsigned long __arg)\n\
-{\n\
-  return __arg;\n\
-}\n\n\
-/* Convert a host short to a network short.  */\n\n\
-static __inline__ unsigned short\n\
-htons (unsigned int __arg)\n\
-{\n\
-  return __arg;\n\
-}\n\n\
+  #ifndef __BYTE_ORDER__\n\
+    #define __BYTE_ORDER__ __BIG_ENDIAN__\n\
+  #endif\n\n\
+  /* Convert a host long to a network long.  */\n\n\
+  static __inline__ unsigned long\n\
+  htonl (unsigned long __arg)\n\
+  {\n\
+    return __arg;\n\
+  }\n\n\
+  /* Convert a host short to a network short.  */\n\n\
+  static __inline__ unsigned short\n\
+  htons (unsigned int __arg)\n\
+  {\n\
+    return __arg;\n\
+  }\n\n\
 #endif /* big-endian */\n\n\
 /* Convert a network long to a host long.  */\n\n\
 static __inline__ unsigned long\n\
@@ -667,14 +406,13 @@ ntohs (unsigned int __arg)\n\
 {\n\
   return htons (__arg);\n\
 }\n\
-#endif\n",
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aab_Ultrix_Ansi_Compat fix
  */
-#define AAB_ULTRIX_ANSI_COMPAT_FIXIDX    13
 tSCC zAab_Ultrix_Ansi_CompatName[] =
      "AAB_ultrix_ansi_compat";
 
@@ -709,7 +447,6 @@ static const char* apzAab_Ultrix_Ansi_CompatPatch[] = {
  *
  *  Description of Aab_Ultrix_Limits fix
  */
-#define AAB_ULTRIX_LIMITS_FIXIDX         14
 tSCC zAab_Ultrix_LimitsName[] =
      "AAB_ultrix_limits";
 
@@ -732,16 +469,15 @@ tSCC* apzAab_Ultrix_LimitsMachs[] = {
  */
 static const char* apzAab_Ultrix_LimitsPatch[] = {
 "#ifndef _LIMITS_INCLUDED\n\
-#define _LIMITS_INCLUDED\n\
-#include <sys/limits.h>\n\
-#endif /* _LIMITS_INCLUDED */\n",
+  #define _LIMITS_INCLUDED\n\
+  #include <sys/limits.h>\n\
+#endif /* _LIMITS_INCLUDED */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aab_Ultrix_Memory fix
  */
-#define AAB_ULTRIX_MEMORY_FIXIDX         15
 tSCC zAab_Ultrix_MemoryName[] =
      "AAB_ultrix_memory";
 
@@ -764,16 +500,15 @@ tSCC* apzAab_Ultrix_MemoryMachs[] = {
  */
 static const char* apzAab_Ultrix_MemoryPatch[] = {
 "#ifndef _MEMORY_INCLUDED\n\
-#define _MEMORY_INCLUDED\n\
-#include <strings.h>\n\
-#endif /* _MEMORY_INCLUDED */\n",
+  #define _MEMORY_INCLUDED\n\
+  #include <strings.h>\n\
+#endif /* _MEMORY_INCLUDED */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aab_Ultrix_String fix
  */
-#define AAB_ULTRIX_STRING_FIXIDX         16
 tSCC zAab_Ultrix_StringName[] =
      "AAB_ultrix_string";
 
@@ -796,16 +531,15 @@ tSCC* apzAab_Ultrix_StringMachs[] = {
  */
 static const char* apzAab_Ultrix_StringPatch[] = {
 "#ifndef _STRING_INCLUDED\n\
-#define _STRING_INCLUDED\n\
-#include <strings.h>\n\
-#endif /* _STRING_INCLUDED */\n",
+  #define _STRING_INCLUDED\n\
+  #include <strings.h>\n\
+#endif /* _STRING_INCLUDED */",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Aix_Pthread fix
  */
-#define AIX_PTHREAD_FIXIDX               17
 tSCC zAix_PthreadName[] =
      "aix_pthread";
 
@@ -843,7 +577,6 @@ static const char* apzAix_PthreadPatch[] = {
  *
  *  Description of Aix_Sysmachine fix
  */
-#define AIX_SYSMACHINE_FIXIDX            18
 tSCC zAix_SysmachineName[] =
      "aix_sysmachine";
 
@@ -879,7 +612,6 @@ static const char* apzAix_SysmachinePatch[] = {
  *
  *  Description of Aix_Syswait fix
  */
-#define AIX_SYSWAIT_FIXIDX               19
 tSCC zAix_SyswaitName[] =
      "aix_syswait";
 
@@ -919,7 +651,6 @@ static const char* apzAix_SyswaitPatch[] = {
  *
  *  Description of Aix_Volatile fix
  */
-#define AIX_VOLATILE_FIXIDX              20
 tSCC zAix_VolatileName[] =
      "aix_volatile";
 
@@ -955,7 +686,6 @@ static const char* apzAix_VolatilePatch[] = {
  *
  *  Description of Alpha___Assert fix
  */
-#define ALPHA___ASSERT_FIXIDX            21
 tSCC zAlpha___AssertName[] =
      "alpha___assert";
 
@@ -989,45 +719,190 @@ static const char* apzAlpha___AssertPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_Getopt fix
+ *  Description of Alpha___Extern_Prefix fix
  */
-#define ALPHA_GETOPT_FIXIDX              22
-tSCC zAlpha_GetoptName[] =
-     "alpha_getopt";
+tSCC zAlpha___Extern_PrefixName[] =
+     "alpha___extern_prefix";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha_GetoptList[] =
-  "|stdio.h|stdlib.h|";
+#define zAlpha___Extern_PrefixList (char*)NULL
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAlpha_GetoptMachs (const char**)NULL
+tSCC* apzAlpha___Extern_PrefixMachs[] = {
+        "alpha*-dec-osf*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha_GetoptSelect0[] =
-       "getopt\\(int, char \\*\\[\\], *char \\*\\)";
+tSCC zAlpha___Extern_PrefixSelect0[] =
+       "(.*)(defined\\(__DECC\\)|def[ \t]*__DECC)[ \t]*\n\
+(#[ \t]*pragma[ \t]*extern_prefix.*)";
 
-#define    ALPHA_GETOPT_TEST_CT  1
-static tTestDesc aAlpha_GetoptTests[] = {
-  { TT_EGREP,    zAlpha_GetoptSelect0, (regex_t*)NULL }, };
+#define    ALPHA___EXTERN_PREFIX_TEST_CT  1
+static tTestDesc aAlpha___Extern_PrefixTests[] = {
+  { TT_EGREP,    zAlpha___Extern_PrefixSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha_Getopt
+ *  Fix Command Arguments for Alpha___Extern_Prefix
  */
-static const char* apzAlpha_GetoptPatch[] = {
+static const char* apzAlpha___Extern_PrefixPatch[] = {
     "format",
-    "getopt(int, char *const[], const char *)",
+    "%1 (defined(__DECC) || defined(__PRAGMA_EXTERN_PREFIX))\n\
+%3",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Alpha___Extern_Prefix_Standards fix
+ */
+tSCC zAlpha___Extern_Prefix_StandardsName[] =
+     "alpha___extern_prefix_standards";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAlpha___Extern_Prefix_StandardsList[] =
+  "|standards.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAlpha___Extern_Prefix_StandardsMachs[] = {
+        "alpha*-dec-osf*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAlpha___Extern_Prefix_StandardsSelect0[] =
+       ".*!defined\\(_LIBC_POLLUTION_H_\\) && !defined\\(__DECC\\)";
+
+#define    ALPHA___EXTERN_PREFIX_STANDARDS_TEST_CT  1
+static tTestDesc aAlpha___Extern_Prefix_StandardsTests[] = {
+  { TT_EGREP,    zAlpha___Extern_Prefix_StandardsSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Alpha___Extern_Prefix_Standards
+ */
+static const char* apzAlpha___Extern_Prefix_StandardsPatch[] = {
+    "format",
+    "%0 && !defined(__PRAGMA_EXTERN_PREFIX)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Alpha___Extern_Prefix_Sys_Stat fix
+ */
+tSCC zAlpha___Extern_Prefix_Sys_StatName[] =
+     "alpha___extern_prefix_sys_stat";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAlpha___Extern_Prefix_Sys_StatList[] =
+  "|sys/stat.h|sys/mount.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAlpha___Extern_Prefix_Sys_StatMachs[] = {
+        "alpha*-dec-osf5*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAlpha___Extern_Prefix_Sys_StatSelect0[] =
+       "#[ \t]*if[ \t]*defined\\(__DECC\\)";
+
+#define    ALPHA___EXTERN_PREFIX_SYS_STAT_TEST_CT  1
+static tTestDesc aAlpha___Extern_Prefix_Sys_StatTests[] = {
+  { TT_EGREP,    zAlpha___Extern_Prefix_Sys_StatSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Alpha___Extern_Prefix_Sys_Stat
+ */
+static const char* apzAlpha___Extern_Prefix_Sys_StatPatch[] = {
+    "format",
+    "%0 || defined(__PRAGMA_EXTERN_PREFIX)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Alpha_Assert fix
+ */
+tSCC zAlpha_AssertName[] =
+     "alpha_assert";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAlpha_AssertList[] =
+  "|assert.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAlpha_AssertMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAlpha_AssertSelect0[] =
+       "(#define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
+
+#define    ALPHA_ASSERT_TEST_CT  1
+static tTestDesc aAlpha_AssertTests[] = {
+  { TT_EGREP,    zAlpha_AssertSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Alpha_Assert
+ */
+static const char* apzAlpha_AssertPatch[] = {
+    "format",
+    "%1(EX)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Alpha_Getopt fix
+ */
+tSCC zAlpha_GetoptName[] =
+     "alpha_getopt";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAlpha_GetoptList[] =
+  "|stdio.h|stdlib.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAlpha_GetoptMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAlpha_GetoptSelect0[] =
+       "getopt\\(int, char \\*\\[\\], *char \\*\\)";
+
+#define    ALPHA_GETOPT_TEST_CT  1
+static tTestDesc aAlpha_GetoptTests[] = {
+  { TT_EGREP,    zAlpha_GetoptSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Alpha_Getopt
+ */
+static const char* apzAlpha_GetoptPatch[] = {
+    "format",
+    "getopt(int, char *const[], const char *)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Alpha_Parens fix
  */
-#define ALPHA_PARENS_FIXIDX              23
 tSCC zAlpha_ParensName[] =
      "alpha_parens";
 
@@ -1061,154 +936,159 @@ static const char* apzAlpha_ParensPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_Sbrk fix
+ *  Description of Alpha_Pthread fix
  */
-#define ALPHA_SBRK_FIXIDX                24
-tSCC zAlpha_SbrkName[] =
-     "alpha_sbrk";
+tSCC zAlpha_PthreadName[] =
+     "alpha_pthread";
 
 /*
  *  File name selection pattern
  */
-tSCC zAlpha_SbrkList[] =
-  "|unistd.h|";
+tSCC zAlpha_PthreadList[] =
+  "|pthread.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAlpha_SbrkMachs (const char**)NULL
+tSCC* apzAlpha_PthreadMachs[] = {
+        "alpha*-dec-osf*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAlpha_SbrkSelect0[] =
-       "char[ \t]*\\*[\t ]*sbrk[ \t]*\\(";
+tSCC zAlpha_PthreadSelect0[] =
+       "((#[ \t]*if)([ \t]*defined[ \t]*\\(_PTHREAD_ENV_DECC\\)|def _PTHREAD_ENV_DECC)(.*))\n\
+(#[ \t]*define _PTHREAD_USE_PTDNAM_)";
 
-#define    ALPHA_SBRK_TEST_CT  1
-static tTestDesc aAlpha_SbrkTests[] = {
-  { TT_EGREP,    zAlpha_SbrkSelect0, (regex_t*)NULL }, };
+#define    ALPHA_PTHREAD_TEST_CT  1
+static tTestDesc aAlpha_PthreadTests[] = {
+  { TT_EGREP,    zAlpha_PthreadSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Alpha_Sbrk
+ *  Fix Command Arguments for Alpha_Pthread
  */
-static const char* apzAlpha_SbrkPatch[] = {
+static const char* apzAlpha_PthreadPatch[] = {
     "format",
-    "void *sbrk(",
+    "%2 defined (_PTHREAD_ENV_DECC)%4 || defined (__PRAGMA_EXTERN_PREFIX)\n\
+%5",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Arm_Norcroft_Hint fix
+ *  Description of Alpha_Pthread_Gcc fix
  */
-#define ARM_NORCROFT_HINT_FIXIDX         25
-tSCC zArm_Norcroft_HintName[] =
-     "arm_norcroft_hint";
+tSCC zAlpha_Pthread_GccName[] =
+     "alpha_pthread_gcc";
 
 /*
  *  File name selection pattern
  */
-tSCC zArm_Norcroft_HintList[] =
-  "|X11/Intrinsic.h|";
+tSCC zAlpha_Pthread_GccList[] =
+  "|pthread.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzArm_Norcroft_HintMachs (const char**)NULL
+tSCC* apzAlpha_Pthread_GccMachs[] = {
+        "alpha*-dec-osf*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zArm_Norcroft_HintSelect0[] =
-       "___type p_type";
+tSCC zAlpha_Pthread_GccSelect0[] =
+       "#else\n\
+# error <pthread.h>: unrecognized compiler.";
 
-#define    ARM_NORCROFT_HINT_TEST_CT  1
-static tTestDesc aArm_Norcroft_HintTests[] = {
-  { TT_EGREP,    zArm_Norcroft_HintSelect0, (regex_t*)NULL }, };
+#define    ALPHA_PTHREAD_GCC_TEST_CT  1
+static tTestDesc aAlpha_Pthread_GccTests[] = {
+  { TT_EGREP,    zAlpha_Pthread_GccSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Arm_Norcroft_Hint
+ *  Fix Command Arguments for Alpha_Pthread_Gcc
  */
-static const char* apzArm_Norcroft_HintPatch[] = {
+static const char* apzAlpha_Pthread_GccPatch[] = {
     "format",
-    "p_type",
+    "#elif defined (__GNUC__)\n\
+# define _PTHREAD_ENV_GCC\n\
+%0",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Arm_Wchar fix
+ *  Description of Alpha_Sbrk fix
  */
-#define ARM_WCHAR_FIXIDX                 26
-tSCC zArm_WcharName[] =
-     "arm_wchar";
+tSCC zAlpha_SbrkName[] =
+     "alpha_sbrk";
 
 /*
  *  File name selection pattern
  */
-tSCC zArm_WcharList[] =
-  "|stdlib.h|";
+tSCC zAlpha_SbrkList[] =
+  "|unistd.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzArm_WcharMachs (const char**)NULL
+#define apzAlpha_SbrkMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zArm_WcharSelect0[] =
-       "#[ \t]*define[ \t]*__wchar_t";
+tSCC zAlpha_SbrkSelect0[] =
+       "char[ \t]*\\*[\t ]*sbrk[ \t]*\\(";
 
-#define    ARM_WCHAR_TEST_CT  1
-static tTestDesc aArm_WcharTests[] = {
-  { TT_EGREP,    zArm_WcharSelect0, (regex_t*)NULL }, };
+#define    ALPHA_SBRK_TEST_CT  1
+static tTestDesc aAlpha_SbrkTests[] = {
+  { TT_EGREP,    zAlpha_SbrkSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Arm_Wchar
+ *  Fix Command Arguments for Alpha_Sbrk
  */
-static const char* apzArm_WcharPatch[] = {
+static const char* apzAlpha_SbrkPatch[] = {
     "format",
-    "%1_GCC_WCHAR_T",
-    "(#[ \t]*(ifndef|define)[ \t]+)__wchar_t",
+    "void *sbrk(",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Aux_Asm fix
+ *  Description of Alpha_Wchar fix
  */
-#define AUX_ASM_FIXIDX                   27
-tSCC zAux_AsmName[] =
-     "aux_asm";
+tSCC zAlpha_WcharName[] =
+     "alpha_wchar";
 
 /*
  *  File name selection pattern
  */
-tSCC zAux_AsmList[] =
-  "|sys/param.h|";
+tSCC zAlpha_WcharList[] =
+  "|wchar.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzAux_AsmMachs (const char**)NULL
+tSCC* apzAlpha_WcharMachs[] = {
+        "alpha*-dec-osf4*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zAux_AsmSelect0[] =
-       "#ifndef NOINLINE";
+tSCC zAlpha_WcharSelect0[] =
+       "#define wcstok wcstok_r";
 
-#define    AUX_ASM_TEST_CT  1
-static tTestDesc aAux_AsmTests[] = {
-  { TT_EGREP,    zAux_AsmSelect0, (regex_t*)NULL }, };
+#define    ALPHA_WCHAR_TEST_CT  1
+static tTestDesc aAlpha_WcharTests[] = {
+  { TT_EGREP,    zAlpha_WcharSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Aux_Asm
+ *  Fix Command Arguments for Alpha_Wchar
  */
-static const char* apzAux_AsmPatch[] = {
-    "format",
-    "#if !defined(NOINLINE) && !defined(__GNUC__)",
+static const char* apzAlpha_WcharPatch[] = { "sed",
+    "-e", "s@#define wcstok wcstok_r@extern wchar_t *wcstok __((wchar_t *, const wchar_t *, wchar_t **)) __asm__(\"wcstok_r\");@",
+    "-e", "s@#define wcsftime __wcsftime_isoc@extern size_t   wcsftime __((wchar_t *, size_t, const wchar_t *, const struct tm *)) __asm__(\"__wcsftime_isoc\");@",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Avoid_Bool_Define fix
  */
-#define AVOID_BOOL_DEFINE_FIXIDX         28
 tSCC zAvoid_Bool_DefineName[] =
      "avoid_bool_define";
 
@@ -1232,7 +1112,7 @@ tSCC zAvoid_Bool_DefineSelect0[] =
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zAvoid_Bool_DefineBypass0[] =
-       "we must use the C\\+\\+ compiler's type";
+       "__cplusplus";
 
 #define    AVOID_BOOL_DEFINE_TEST_CT  2
 static tTestDesc aAvoid_Bool_DefineTests[] = {
@@ -1254,7 +1134,6 @@ static const char* apzAvoid_Bool_DefinePatch[] = {
  *
  *  Description of Avoid_Bool_Type fix
  */
-#define AVOID_BOOL_TYPE_FIXIDX           29
 tSCC zAvoid_Bool_TypeName[] =
      "avoid_bool_type";
 
@@ -1278,7 +1157,7 @@ tSCC zAvoid_Bool_TypeSelect0[] =
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zAvoid_Bool_TypeBypass0[] =
-       "we must use the C\\+\\+ compiler's type";
+       "__cplusplus";
 
 #define    AVOID_BOOL_TYPE_TEST_CT  2
 static tTestDesc aAvoid_Bool_TypeTests[] = {
@@ -1299,7 +1178,6 @@ static const char* apzAvoid_Bool_TypePatch[] = {
  *
  *  Description of Avoid_Wchar_T_Type fix
  */
-#define AVOID_WCHAR_T_TYPE_FIXIDX        30
 tSCC zAvoid_Wchar_T_TypeName[] =
      "avoid_wchar_t_type";
 
@@ -1318,8 +1196,21 @@ tSCC zAvoid_Wchar_T_TypeName[] =
 tSCC zAvoid_Wchar_T_TypeSelect0[] =
        "^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;";
 
-#define    AVOID_WCHAR_T_TYPE_TEST_CT  1
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zAvoid_Wchar_T_TypeBypass0[] =
+       "__cplusplus";
+tSCC zAvoid_Wchar_T_TypeBypass1[] =
+       "_LINUX_NLS_H";
+tSCC zAvoid_Wchar_T_TypeBypass2[] =
+       "XFree86: xc/lib/X11/Xlib\\.h";
+
+#define    AVOID_WCHAR_T_TYPE_TEST_CT  4
 static tTestDesc aAvoid_Wchar_T_TypeTests[] = {
+  { TT_NEGREP,   zAvoid_Wchar_T_TypeBypass0, (regex_t*)NULL },
+  { TT_NEGREP,   zAvoid_Wchar_T_TypeBypass1, (regex_t*)NULL },
+  { TT_NEGREP,   zAvoid_Wchar_T_TypeBypass2, (regex_t*)NULL },
   { TT_EGREP,    zAvoid_Wchar_T_TypeSelect0, (regex_t*)NULL }, };
 
 /*
@@ -1336,7 +1227,6 @@ static const char* apzAvoid_Wchar_T_TypePatch[] = {
  *
  *  Description of Bad_Lval fix
  */
-#define BAD_LVAL_FIXIDX                  31
 tSCC zBad_LvalName[] =
      "bad_lval";
 
@@ -1344,7 +1234,7 @@ tSCC zBad_LvalName[] =
  *  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|";
+  "|dirent.h|ftw.h|grp.h|libgen.h|ndbm.h|pthread.h|pwd.h|signal.h|standards.h|stdio.h|stdlib.h|string.h|stropts.h|sys/mount.h|sys/resource.h|sys/signal.h|sys/socket.h|sys/stat.h|sys/stropts.h|sys/uio.h|time.h|unistd.h|utmp.h|utmpx.h|wchar.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1371,7 +1261,6 @@ static const char* apzBad_LvalPatch[] = { "sed",
  *
  *  Description of Bad_Struct_Term fix
  */
-#define BAD_STRUCT_TERM_FIXIDX           32
 tSCC zBad_Struct_TermName[] =
      "bad_struct_term";
 
@@ -1407,7 +1296,6 @@ static const char* apzBad_Struct_TermPatch[] = {
  *
  *  Description of Badquote fix
  */
-#define BADQUOTE_FIXIDX                  33
 tSCC zBadquoteName[] =
      "badquote";
 
@@ -1443,7 +1331,6 @@ static const char* apzBadquotePatch[] = {
  *
  *  Description of Broken_Assert_Stdio fix
  */
-#define BROKEN_ASSERT_STDIO_FIXIDX       34
 tSCC zBroken_Assert_StdioName[] =
      "broken_assert_stdio";
 
@@ -1486,7 +1373,6 @@ static const char* apzBroken_Assert_StdioPatch[] = {
  *
  *  Description of Broken_Assert_Stdlib fix
  */
-#define BROKEN_ASSERT_STDLIB_FIXIDX      35
 tSCC zBroken_Assert_StdlibName[] =
      "broken_assert_stdlib";
 
@@ -1531,7 +1417,6 @@ static const char* apzBroken_Assert_StdlibPatch[] = {
  *
  *  Description of Broken_Cabs fix
  */
-#define BROKEN_CABS_FIXIDX               36
 tSCC zBroken_CabsName[] =
      "broken_cabs";
 
@@ -1539,7 +1424,7 @@ tSCC zBroken_CabsName[] =
  *  File name selection pattern
  */
 tSCC zBroken_CabsList[] =
-  "|math.h|";
+  "|math.h|architecture/ppc/math.h|architecture/i386/math.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1561,14 +1446,53 @@ static tTestDesc aBroken_CabsTests[] = {
 static const char* apzBroken_CabsPatch[] = {
     "format",
     "",
-    "^extern[ \t]+double[ \t]+cabs\\((struct dbl_hypot|)\\);",
+    "^extern[ \t]+double[ \t]+cabs[ \t]*\\([^\\)]*\\);",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Bsd_Stdio_Attrs_Conflict fix
+ */
+tSCC zBsd_Stdio_Attrs_ConflictName[] =
+     "bsd_stdio_attrs_conflict";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zBsd_Stdio_Attrs_ConflictList[] =
+  "|stdio.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzBsd_Stdio_Attrs_ConflictMachs[] = {
+        "*-*-*bsd*",
+        "*-*-*darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zBsd_Stdio_Attrs_ConflictSelect0[] =
+       "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$";
+
+#define    BSD_STDIO_ATTRS_CONFLICT_TEST_CT  1
+static tTestDesc aBsd_Stdio_Attrs_ConflictTests[] = {
+  { TT_EGREP,    zBsd_Stdio_Attrs_ConflictSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Bsd_Stdio_Attrs_Conflict
+ */
+static const char* apzBsd_Stdio_Attrs_ConflictPatch[] = {
+    "format",
+    "#define _BSD_STRING(_BSD_X) _BSD_STRINGX(_BSD_X)\n\
+#define _BSD_STRINGX(_BSD_X) #_BSD_X\n\
+int vfscanf(FILE *, const char *, __builtin_va_list) __asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) \"__svfscanf\");",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Ctrl_Quotes_Def fix
  */
-#define CTRL_QUOTES_DEF_FIXIDX           37
 tSCC zCtrl_Quotes_DefName[] =
      "ctrl_quotes_def";
 
@@ -1603,7 +1527,6 @@ static const char* apzCtrl_Quotes_DefPatch[] = {
  *
  *  Description of Ctrl_Quotes_Use fix
  */
-#define CTRL_QUOTES_USE_FIXIDX           38
 tSCC zCtrl_Quotes_UseName[] =
      "ctrl_quotes_use";
 
@@ -1638,7 +1561,6 @@ static const char* apzCtrl_Quotes_UsePatch[] = {
  *
  *  Description of Cxx_Unready fix
  */
-#define CXX_UNREADY_FIXIDX               39
 tSCC zCxx_UnreadyName[] =
      "cxx_unready";
 
@@ -1682,11 +1604,48 @@ extern \"C\" {\n\
 #endif\n",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Private_Extern fix
+ */
+tSCC zDarwin_Private_ExternName[] =
+     "darwin_private_extern";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Private_ExternList[] =
+  "|mach-o/dyld.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Private_ExternMachs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Private_ExternSelect0[] =
+       "__private_extern__ [a-z_]+ _dyld_";
+
+#define    DARWIN_PRIVATE_EXTERN_TEST_CT  1
+static tTestDesc aDarwin_Private_ExternTests[] = {
+  { TT_EGREP,    zDarwin_Private_ExternSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Private_Extern
+ */
+static const char* apzDarwin_Private_ExternPatch[] = {
+    "format",
+    "extern",
+    "__private_extern__",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Dec_Intern_Asm fix
  */
-#define DEC_INTERN_ASM_FIXIDX            40
 tSCC zDec_Intern_AsmName[] =
      "dec_intern_asm";
 
@@ -1716,7 +1675,6 @@ static const char* apzDec_Intern_AsmPatch[] = { "sed",
  *
  *  Description of Djgpp_Wchar_H fix
  */
-#define DJGPP_WCHAR_H_FIXIDX             41
 tSCC zDjgpp_Wchar_HName[] =
      "djgpp_wchar_h";
 
@@ -1760,7 +1718,6 @@ static const char* apzDjgpp_Wchar_HPatch[] = {
  *
  *  Description of Ecd_Cursor fix
  */
-#define ECD_CURSOR_FIXIDX                42
 tSCC zEcd_CursorName[] =
      "ecd_cursor";
 
@@ -1794,92 +1751,93 @@ static const char* apzEcd_CursorPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Fix_Header_Breakage fix
+ *  Description of Freebsd_Gcc3_Breakage fix
  */
-#define FIX_HEADER_BREAKAGE_FIXIDX       43
-tSCC zFix_Header_BreakageName[] =
-     "fix_header_breakage";
+tSCC zFreebsd_Gcc3_BreakageName[] =
+     "freebsd_gcc3_breakage";
 
 /*
  *  File name selection pattern
  */
-tSCC zFix_Header_BreakageList[] =
-  "|math.h|";
+tSCC zFreebsd_Gcc3_BreakageList[] =
+  "|sys/cdefs.h|";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzFix_Header_BreakageMachs[] = {
-        "m88k-motorola-sysv3*",
+tSCC* apzFreebsd_Gcc3_BreakageMachs[] = {
+        "*-*-freebsd*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zFix_Header_BreakageSelect0[] =
-       "extern double floor\\(\\), ceil\\(\\), fmod\\(\\), fabs\\(\\);";
+tSCC zFreebsd_Gcc3_BreakageSelect0[] =
+       "^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7$";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zFreebsd_Gcc3_BreakageBypass0[] =
+       "__GNUC__[ \\t]*([>=]=[ \\t]*[3-9]|>[ \\t]*2)";
 
-#define    FIX_HEADER_BREAKAGE_TEST_CT  1
-static tTestDesc aFix_Header_BreakageTests[] = {
-  { TT_EGREP,    zFix_Header_BreakageSelect0, (regex_t*)NULL }, };
+#define    FREEBSD_GCC3_BREAKAGE_TEST_CT  2
+static tTestDesc aFreebsd_Gcc3_BreakageTests[] = {
+  { TT_NEGREP,   zFreebsd_Gcc3_BreakageBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zFreebsd_Gcc3_BreakageSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Fix_Header_Breakage
+ *  Fix Command Arguments for Freebsd_Gcc3_Breakage
  */
-static const char* apzFix_Header_BreakagePatch[] = {
+static const char* apzFreebsd_Gcc3_BreakagePatch[] = {
     "format",
-    "extern double floor(), ceil(), fmod(), fabs _PARAMS((double));",
+    "%0 || __GNUC__ >= 3",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Freebsd_Gcc3_Breakage fix
+ *  Description of Gnu_Types fix
  */
-#define FREEBSD_GCC3_BREAKAGE_FIXIDX     44
-tSCC zFreebsd_Gcc3_BreakageName[] =
-     "freebsd_gcc3_breakage";
+tSCC zGnu_TypesName[] =
+     "gnu_types";
 
 /*
  *  File name selection pattern
  */
-tSCC zFreebsd_Gcc3_BreakageList[] =
-  "|sys/cdefs.h|";
+tSCC zGnu_TypesList[] =
+  "|sys/types.h|stdlib.h|sys/stdtypes.h|stddef.h|memory.h|unistd.h|";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzFreebsd_Gcc3_BreakageMachs[] = {
-        "*-*-freebsd*",
-        (const char*)NULL };
+#define apzGnu_TypesMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zFreebsd_Gcc3_BreakageSelect0[] =
-       "^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7$";
+tSCC zGnu_TypesSelect0[] =
+       "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;";
 
 /*
  *  content bypass pattern - skip fix if pattern found
  */
-tSCC zFreebsd_Gcc3_BreakageBypass0[] =
-       "__GNUC__[ \\t]*([>=]=[ \\t]*[3-9]|>[ \\t]*2)";
+tSCC zGnu_TypesBypass0[] =
+       "_GCC_(PTRDIFF|SIZE|WCHAR)_T";
 
-#define    FREEBSD_GCC3_BREAKAGE_TEST_CT  2
-static tTestDesc aFreebsd_Gcc3_BreakageTests[] = {
-  { TT_NEGREP,   zFreebsd_Gcc3_BreakageBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zFreebsd_Gcc3_BreakageSelect0, (regex_t*)NULL }, };
+#define    GNU_TYPES_TEST_CT  2
+static tTestDesc aGnu_TypesTests[] = {
+  { TT_NEGREP,   zGnu_TypesBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zGnu_TypesSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Freebsd_Gcc3_Breakage
+ *  Fix Command Arguments for Gnu_Types
  */
-static const char* apzFreebsd_Gcc3_BreakagePatch[] = {
-    "format",
-    "%0 || __GNUC__ >= 3",
+static const char* apzGnu_TypesPatch[] = {
+    "gnu_type",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Hp_Inline fix
  */
-#define HP_INLINE_FIXIDX                 45
 tSCC zHp_InlineName[] =
      "hp_inline";
 
@@ -1916,7 +1874,6 @@ static const char* apzHp_InlinePatch[] = {
  *
  *  Description of Hp_Sysfile fix
  */
-#define HP_SYSFILE_FIXIDX                46
 tSCC zHp_SysfileName[] =
      "hp_sysfile";
 
@@ -1951,17 +1908,248 @@ static const char* apzHp_SysfilePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux11_Fabsf fix
+ *  Description of Hpux10_Cpp_Pow_Inline fix
  */
-#define HPUX11_FABSF_FIXIDX              47
-tSCC zHpux11_FabsfName[] =
-     "hpux11_fabsf";
+tSCC zHpux10_Cpp_Pow_InlineName[] =
+     "hpux10_cpp_pow_inline";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux11_FabsfList[] =
-  "|math.h|";
+tSCC zHpux10_Cpp_Pow_InlineList[] =
+  "|fixinc-test-limits.h|math.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHpux10_Cpp_Pow_InlineMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux10_Cpp_Pow_InlineSelect0[] =
+       "^# +ifdef +__cplusplus\n\
+ +\\}\n\
+ +inline +double +pow\\(double +__d,int +__expon\\) +\\{\n\
+[ \t]+return +pow\\(__d,\\(double\\)__expon\\);\n\
+ +\\}\n\
+ +extern +\"C\" +\\{\n\
+#else\n\
+# +endif";
+
+#define    HPUX10_CPP_POW_INLINE_TEST_CT  1
+static tTestDesc aHpux10_Cpp_Pow_InlineTests[] = {
+  { TT_EGREP,    zHpux10_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux10_Cpp_Pow_Inline
+ */
+static const char* apzHpux10_Cpp_Pow_InlinePatch[] = {
+    "format",
+    "",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux11_Cpp_Pow_Inline fix
+ */
+tSCC zHpux11_Cpp_Pow_InlineName[] =
+     "hpux11_cpp_pow_inline";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_Cpp_Pow_InlineList[] =
+  "|math.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHpux11_Cpp_Pow_InlineMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_Cpp_Pow_InlineSelect0[] =
+       " +inline double pow\\(double d,int expon\\) \\{\n\
+ +return pow\\(d, \\(double\\)expon\\);\n\
+ +\\}\n";
+
+#define    HPUX11_CPP_POW_INLINE_TEST_CT  1
+static tTestDesc aHpux11_Cpp_Pow_InlineTests[] = {
+  { TT_EGREP,    zHpux11_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Cpp_Pow_Inline
+ */
+static const char* apzHpux11_Cpp_Pow_InlinePatch[] = {
+    "format",
+    "",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux10_Ctype_Declarations1 fix
+ */
+tSCC zHpux10_Ctype_Declarations1Name[] =
+     "hpux10_ctype_declarations1";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux10_Ctype_Declarations1List[] =
+  "|ctype.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHpux10_Ctype_Declarations1Machs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux10_Ctype_Declarations1Select0[] =
+       "^#[ \t]*define _toupper\\(__c\\)[ \t]*__toupper\\(__c\\)";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zHpux10_Ctype_Declarations1Bypass0[] =
+       "^[ \t]*extern[ \t]*int[ \t]*__tolower[ \t]*\\(";
+
+#define    HPUX10_CTYPE_DECLARATIONS1_TEST_CT  2
+static tTestDesc aHpux10_Ctype_Declarations1Tests[] = {
+  { TT_NEGREP,   zHpux10_Ctype_Declarations1Bypass0, (regex_t*)NULL },
+  { TT_EGREP,    zHpux10_Ctype_Declarations1Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux10_Ctype_Declarations1
+ */
+static const char* apzHpux10_Ctype_Declarations1Patch[] = {
+    "format",
+    "#ifdef _PROTOTYPES\n\
+extern int __tolower(int);\n\
+extern int __toupper(int);\n\
+#else /* NOT _PROTOTYPES */\n\
+extern int __tolower();\n\
+extern int __toupper();\n\
+#endif /* _PROTOTYPES */\n\n\
+%0\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux10_Ctype_Declarations2 fix
+ */
+tSCC zHpux10_Ctype_Declarations2Name[] =
+     "hpux10_ctype_declarations2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux10_Ctype_Declarations2List[] =
+  "|ctype.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHpux10_Ctype_Declarations2Machs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux10_Ctype_Declarations2Select0[] =
+       "^#  if defined\\(_SB_CTYPE_MACROS\\) && \\!defined\\(__lint\\)";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zHpux10_Ctype_Declarations2Bypass0[] =
+       "^[ \t]*extern[ \t]*int[ \t]*_isalnum[ \t]*\\(";
+
+#define    HPUX10_CTYPE_DECLARATIONS2_TEST_CT  2
+static tTestDesc aHpux10_Ctype_Declarations2Tests[] = {
+  { TT_NEGREP,   zHpux10_Ctype_Declarations2Bypass0, (regex_t*)NULL },
+  { TT_EGREP,    zHpux10_Ctype_Declarations2Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux10_Ctype_Declarations2
+ */
+static const char* apzHpux10_Ctype_Declarations2Patch[] = {
+    "format",
+    "%0\n\n\
+#ifdef _PROTOTYPES\n\
+     extern int _isalnum(int);\n\
+     extern int _isalpha(int);\n\
+     extern int _iscntrl(int);\n\
+     extern int _isdigit(int);\n\
+     extern int _isgraph(int);\n\
+     extern int _islower(int);\n\
+     extern int _isprint(int);\n\
+     extern int _ispunct(int);\n\
+     extern int _isspace(int);\n\
+     extern int _isupper(int);\n\
+     extern int _isxdigit(int);\n\
+#  else /* not _PROTOTYPES */\n\
+     extern int _isalnum();\n\
+     extern int _isalpha();\n\
+     extern int _iscntrl();\n\
+     extern int _isdigit();\n\
+     extern int _isgraph();\n\
+     extern int _islower();\n\
+     extern int _isprint();\n\
+     extern int _ispunct();\n\
+     extern int _isspace();\n\
+     extern int _isupper();\n\
+     extern int _isxdigit();\n\
+#endif /* _PROTOTYPES */\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux11_Abs fix
+ */
+tSCC zHpux11_AbsName[] =
+     "hpux11_abs";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_AbsList[] =
+  "|stdlib.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux11_AbsMachs[] = {
+        "ia64-hp-hpux11*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_AbsSelect0[] =
+       "ifndef _MATH_INCLUDED";
+
+#define    HPUX11_ABS_TEST_CT  1
+static tTestDesc aHpux11_AbsTests[] = {
+  { TT_EGREP,    zHpux11_AbsSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Abs
+ */
+static const char* apzHpux11_AbsPatch[] = {
+    "format",
+    "if !defined(_MATH_INCLUDED) || defined(__GNUG__)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux11_Fabsf fix
+ */
+tSCC zHpux11_FabsfName[] =
+     "hpux11_fabsf";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_FabsfList[] =
+  "|math.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1996,225 +2184,263 @@ static const char* apzHpux11_FabsfPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux11_Uint32_C fix
+ *  Description of Hpux11_Size_T fix
  */
-#define HPUX11_UINT32_C_FIXIDX           48
-tSCC zHpux11_Uint32_CName[] =
-     "hpux11_uint32_c";
+tSCC zHpux11_Size_TName[] =
+     "hpux11_size_t";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux11_Uint32_CList[] =
-  "|inttypes.h|";
+#define zHpux11_Size_TList (char*)NULL
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux11_Uint32_CMachs (const char**)NULL
+tSCC* apzHpux11_Size_TMachs[] = {
+        "*-hp-hpux11*",
+        (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\\)";
+tSCC zHpux11_Size_TSelect0[] =
+       "__size_t";
 
-#define    HPUX11_UINT32_C_TEST_CT  1
-static tTestDesc aHpux11_Uint32_CTests[] = {
-  { TT_EGREP,    zHpux11_Uint32_CSelect0, (regex_t*)NULL }, };
+#define    HPUX11_SIZE_T_TEST_CT  1
+static tTestDesc aHpux11_Size_TTests[] = {
+  { TT_EGREP,    zHpux11_Size_TSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux11_Uint32_C
+ *  Fix Command Arguments for Hpux11_Size_T
  */
-static const char* apzHpux11_Uint32_CPatch[] = {
+static const char* apzHpux11_Size_TPatch[] = {
     "format",
-    "#define UINT32_C(__c) __CONCAT__(__c,ul)",
+    "_hpux_size_t",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux8_Bogus_Inlines fix
+ *  Description of Hpux11_Snprintf fix
  */
-#define HPUX8_BOGUS_INLINES_FIXIDX       49
-tSCC zHpux8_Bogus_InlinesName[] =
-     "hpux8_bogus_inlines";
+tSCC zHpux11_SnprintfName[] =
+     "hpux11_snprintf";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux8_Bogus_InlinesList[] =
-  "|math.h|";
+tSCC zHpux11_SnprintfList[] =
+  "|stdio.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzHpux8_Bogus_InlinesMachs (const char**)NULL
+#define apzHpux11_SnprintfMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux8_Bogus_InlinesSelect0[] =
-       "inline";
+tSCC zHpux11_SnprintfSelect0[] =
+       "(extern int snprintf *\\(char *\\*, *(|__|_hpux_)size_t,) *(char *\\*, *\\.\\.\\.\\);)";
 
-#define    HPUX8_BOGUS_INLINES_TEST_CT  1
-static tTestDesc aHpux8_Bogus_InlinesTests[] = {
-  { TT_EGREP,    zHpux8_Bogus_InlinesSelect0, (regex_t*)NULL }, };
+#define    HPUX11_SNPRINTF_TEST_CT  1
+static tTestDesc aHpux11_SnprintfTests[] = {
+  { TT_EGREP,    zHpux11_SnprintfSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux8_Bogus_Inlines
+ *  Fix Command Arguments for Hpux11_Snprintf
  */
-static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
-    "-e", "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@",
-    "-e", "s@inline double abs(double [a-z][a-z]*) {.*}@@",
-    "-e", "s@inline int sqr(int [a-z][a-z]*) {.*}@@",
-    "-e", "s@inline double sqr(double [a-z][a-z]*) {.*}@@",
+static const char* apzHpux11_SnprintfPatch[] = {
+    "format",
+    "%1 const %3",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Int_Abort_Free_And_Exit fix
+ *  Description of Hpux11_Uint32_C fix
  */
-#define INT_ABORT_FREE_AND_EXIT_FIXIDX   50
-tSCC zInt_Abort_Free_And_ExitName[] =
-     "int_abort_free_and_exit";
+tSCC zHpux11_Uint32_CName[] =
+     "hpux11_uint32_c";
 
 /*
  *  File name selection pattern
  */
-tSCC zInt_Abort_Free_And_ExitList[] =
-  "|stdlib.h|";
+tSCC zHpux11_Uint32_CList[] =
+  "|inttypes.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzInt_Abort_Free_And_ExitMachs (const char**)NULL
+#define apzHpux11_Uint32_CMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zInt_Abort_Free_And_ExitSelect0[] =
-       "int[ \t]+(abort|free|exit)[ \t]*\\(";
+tSCC zHpux11_Uint32_CSelect0[] =
+       "^#define UINT32_C\\(__c\\)[ \t]*__CONCAT__\\(__CONCAT_U__\\(__c\\),l\\)";
 
-#define    INT_ABORT_FREE_AND_EXIT_TEST_CT  1
-static tTestDesc aInt_Abort_Free_And_ExitTests[] = {
-  { TT_EGREP,    zInt_Abort_Free_And_ExitSelect0, (regex_t*)NULL }, };
+#define    HPUX11_UINT32_C_TEST_CT  1
+static tTestDesc aHpux11_Uint32_CTests[] = {
+  { TT_EGREP,    zHpux11_Uint32_CSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Int_Abort_Free_And_Exit
+ *  Fix Command Arguments for Hpux11_Uint32_C
  */
-static const char* apzInt_Abort_Free_And_ExitPatch[] = {
+static const char* apzHpux11_Uint32_CPatch[] = {
     "format",
-    "void\t%1(",
+    "#define UINT32_C(__c) __CONCAT__(__c,ul)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Isc_Omits_With_Stdc fix
+ *  Description of Hpux11_Vsnprintf fix
  */
-#define ISC_OMITS_WITH_STDC_FIXIDX       51
-tSCC zIsc_Omits_With_StdcName[] =
-     "isc_omits_with_stdc";
+tSCC zHpux11_VsnprintfName[] =
+     "hpux11_vsnprintf";
 
 /*
  *  File name selection pattern
  */
-tSCC zIsc_Omits_With_StdcList[] =
-  "|stdio.h|math.h|ctype.h|sys/limits.h|sys/fcntl.h|sys/dirent.h|";
+tSCC zHpux11_VsnprintfList[] =
+  "|stdio.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzIsc_Omits_With_StdcMachs (const char**)NULL
+#define apzHpux11_VsnprintfMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIsc_Omits_With_StdcSelect0[] =
-       "!defined\\(__STDC__\\) && !defined\\(_POSIX_SOURCE\\)";
+tSCC zHpux11_VsnprintfSelect0[] =
+       "(extern int vsnprintf\\(char \\*, _[hpux]*_size_t, const char \\*,) __va__list\\);";
 
-#define    ISC_OMITS_WITH_STDC_TEST_CT  1
-static tTestDesc aIsc_Omits_With_StdcTests[] = {
-  { TT_EGREP,    zIsc_Omits_With_StdcSelect0, (regex_t*)NULL }, };
+#define    HPUX11_VSNPRINTF_TEST_CT  1
+static tTestDesc aHpux11_VsnprintfTests[] = {
+  { TT_EGREP,    zHpux11_VsnprintfSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Isc_Omits_With_Stdc
+ *  Fix Command Arguments for Hpux11_Vsnprintf
  */
-static const char* apzIsc_Omits_With_StdcPatch[] = {
+static const char* apzHpux11_VsnprintfPatch[] = {
     "format",
-    "!defined(_POSIX_SOURCE)",
+    "%1 __va_list);",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Io_Quotes_Def fix
+ *  Description of Hpux8_Bogus_Inlines fix
  */
-#define IO_QUOTES_DEF_FIXIDX             52
-tSCC zIo_Quotes_DefName[] =
-     "io_quotes_def";
+tSCC zHpux8_Bogus_InlinesName[] =
+     "hpux8_bogus_inlines";
 
 /*
  *  File name selection pattern
  */
-#define zIo_Quotes_DefList (char*)NULL
+tSCC zHpux8_Bogus_InlinesList[] =
+  "|math.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzIo_Quotes_DefMachs (const char**)NULL
+#define apzHpux8_Bogus_InlinesMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIo_Quotes_DefSelect0[] =
-       "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\([a-zA-Z][,)]";
+tSCC zHpux8_Bogus_InlinesSelect0[] =
+       "inline";
 
-#define    IO_QUOTES_DEF_TEST_CT  1
-static tTestDesc aIo_Quotes_DefTests[] = {
-  { TT_EGREP,    zIo_Quotes_DefSelect0, (regex_t*)NULL }, };
+#define    HPUX8_BOGUS_INLINES_TEST_CT  1
+static tTestDesc aHpux8_Bogus_InlinesTests[] = {
+  { TT_EGREP,    zHpux8_Bogus_InlinesSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Io_Quotes_Def
+ *  Fix Command Arguments for Hpux8_Bogus_Inlines
  */
-static const char* apzIo_Quotes_DefPatch[] = {
-    "char_macro_def",
-    "IO",
+static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
+    "-e", "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@",
+    "-e", "s@inline double abs(double [a-z][a-z]*) {.*}@@",
+    "-e", "s@inline int sqr(int [a-z][a-z]*) {.*}@@",
+    "-e", "s@inline double sqr(double [a-z][a-z]*) {.*}@@",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Io_Quotes_Use fix
+ *  Description of Hpux_Ctype_Macros fix
  */
-#define IO_QUOTES_USE_FIXIDX             53
-tSCC zIo_Quotes_UseName[] =
-     "io_quotes_use";
+tSCC zHpux_Ctype_MacrosName[] =
+     "hpux_ctype_macros";
 
 /*
  *  File name selection pattern
  */
-#define zIo_Quotes_UseList (char*)NULL
+tSCC zHpux_Ctype_MacrosList[] =
+  "|ctype.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzIo_Quotes_UseMachs (const char**)NULL
+#define apzHpux_Ctype_MacrosMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIo_Quotes_UseSelect0[] =
-       "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+IO[A-Z]*[ \t]*\\( *[^,']";
+tSCC zHpux_Ctype_MacrosSelect0[] =
+       "((: |\\()__SB_masks \\? )(__SB_masks\\[__(alnum|c)\\] & _IS)";
 
-#define    IO_QUOTES_USE_TEST_CT  1
-static tTestDesc aIo_Quotes_UseTests[] = {
-  { TT_EGREP,    zIo_Quotes_UseSelect0, (regex_t*)NULL }, };
+#define    HPUX_CTYPE_MACROS_TEST_CT  1
+static tTestDesc aHpux_Ctype_MacrosTests[] = {
+  { TT_EGREP,    zHpux_Ctype_MacrosSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Io_Quotes_Use
+ *  Fix Command Arguments for Hpux_Ctype_Macros
  */
-static const char* apzIo_Quotes_UsePatch[] = {
-    "char_macro_use",
-    "IO",
+static const char* apzHpux_Ctype_MacrosPatch[] = {
+    "format",
+    "%1(int)%3",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux_Long_Double fix
+ */
+tSCC zHpux_Long_DoubleName[] =
+     "hpux_long_double";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux_Long_DoubleList[] =
+  "|stdlib.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzHpux_Long_DoubleMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux_Long_DoubleSelect0[] =
+       "extern[ \t]long_double[ \t]strtold";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zHpux_Long_DoubleBypass0[] =
+       "long_double_t";
+
+#define    HPUX_LONG_DOUBLE_TEST_CT  2
+static tTestDesc aHpux_Long_DoubleTests[] = {
+  { TT_NEGREP,   zHpux_Long_DoubleBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zHpux_Long_DoubleSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux_Long_Double
+ */
+static const char* apzHpux_Long_DoublePatch[] = { "sed",
+    "-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D",
+    "-e", "s/long_double/long double/g",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Hpux_Maxint fix
  */
-#define HPUX_MAXINT_FIXIDX               54
 tSCC zHpux_MaxintName[] =
      "hpux_maxint";
 
@@ -2267,7 +2493,6 @@ static const char* apzHpux_MaxintPatch[] = {
  *
  *  Description of Hpux_Systime fix
  */
-#define HPUX_SYSTIME_FIXIDX              55
 tSCC zHpux_SystimeName[] =
      "hpux_systime";
 
@@ -2299,11 +2524,113 @@ static const char* apzHpux_SystimePatch[] = {
     "struct sigevent;",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Int_Abort_Free_And_Exit fix
+ */
+tSCC zInt_Abort_Free_And_ExitName[] =
+     "int_abort_free_and_exit";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zInt_Abort_Free_And_ExitList[] =
+  "|stdlib.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzInt_Abort_Free_And_ExitMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zInt_Abort_Free_And_ExitSelect0[] =
+       "int[ \t]+(abort|free|exit)[ \t]*\\(";
+
+#define    INT_ABORT_FREE_AND_EXIT_TEST_CT  1
+static tTestDesc aInt_Abort_Free_And_ExitTests[] = {
+  { TT_EGREP,    zInt_Abort_Free_And_ExitSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Int_Abort_Free_And_Exit
+ */
+static const char* apzInt_Abort_Free_And_ExitPatch[] = {
+    "format",
+    "void\t%1(",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Io_Quotes_Def fix
+ */
+tSCC zIo_Quotes_DefName[] =
+     "io_quotes_def";
+
+/*
+ *  File name selection pattern
+ */
+#define zIo_Quotes_DefList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIo_Quotes_DefMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIo_Quotes_DefSelect0[] =
+       "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\([a-zA-Z][,)]";
+
+#define    IO_QUOTES_DEF_TEST_CT  1
+static tTestDesc aIo_Quotes_DefTests[] = {
+  { TT_EGREP,    zIo_Quotes_DefSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Io_Quotes_Def
+ */
+static const char* apzIo_Quotes_DefPatch[] = {
+    "char_macro_def",
+    "IO",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Io_Quotes_Use fix
+ */
+tSCC zIo_Quotes_UseName[] =
+     "io_quotes_use";
+
+/*
+ *  File name selection pattern
+ */
+#define zIo_Quotes_UseList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIo_Quotes_UseMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIo_Quotes_UseSelect0[] =
+       "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+IO[A-Z]*[ \t]*\\( *[^,']";
+
+#define    IO_QUOTES_USE_TEST_CT  1
+static tTestDesc aIo_Quotes_UseTests[] = {
+  { TT_EGREP,    zIo_Quotes_UseSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Io_Quotes_Use
+ */
+static const char* apzIo_Quotes_UsePatch[] = {
+    "char_macro_use",
+    "IO",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Ip_Missing_Semi fix
  */
-#define IP_MISSING_SEMI_FIXIDX           56
 tSCC zIp_Missing_SemiName[] =
      "ip_missing_semi";
 
@@ -2334,11 +2661,50 @@ static const char* apzIp_Missing_SemiPatch[] = { "sed",
     "-e", "/^struct/,/^};/s/}$/};/",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Irix___Restrict fix
+ */
+tSCC zIrix___RestrictName[] =
+     "irix___restrict";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix___RestrictList[] =
+  "|internal/sgimacros.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzIrix___RestrictMachs[] = {
+        "mips-sgi-irix6.5",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIrix___RestrictSelect0[] =
+       "(#ifdef __c99\n\
+)(#[ \t]*define __restrict restrict)";
+
+#define    IRIX___RESTRICT_TEST_CT  1
+static tTestDesc aIrix___RestrictTests[] = {
+  { TT_EGREP,    zIrix___RestrictSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Irix___Restrict
+ */
+static const char* apzIrix___RestrictPatch[] = {
+    "format",
+    "%1#  ifndef __cplusplus\n\
+%2\n\
+#  endif",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Irix_Asm_Apostrophe fix
  */
-#define IRIX_ASM_APOSTROPHE_FIXIDX       57
 tSCC zIrix_Asm_ApostropheName[] =
      "irix_asm_apostrophe";
 
@@ -2371,11 +2737,87 @@ static const char* apzIrix_Asm_ApostrophePatch[] = {
     "^([ \t]*#.*[Ww]e)'re",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Irix_Limits_Const fix
+ */
+tSCC zIrix_Limits_ConstName[] =
+     "irix_limits_const";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_Limits_ConstList[] =
+  "|fixinc-test-limits.h|limits.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIrix_Limits_ConstMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_Limits_ConstSelect0[] =
+       "^extern const ";
+
+#define    IRIX_LIMITS_CONST_TEST_CT  1
+static tTestDesc aIrix_Limits_ConstTests[] = {
+  { TT_EGREP,    zIrix_Limits_ConstSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Irix_Limits_Const
+ */
+static const char* apzIrix_Limits_ConstPatch[] = {
+    "format",
+    "extern __const ",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Irix_Socklen_T fix
+ */
+tSCC zIrix_Socklen_TName[] =
+     "irix_socklen_t";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_Socklen_TList[] =
+  "|sys/socket.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzIrix_Socklen_TMachs[] = {
+        "mips-sgi-irix6.5",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_Socklen_TSelect0[] =
+       "(#define _SOCKLEN_T\n\
+)(typedef u_int32_t socklen_t;)";
+
+#define    IRIX_SOCKLEN_T_TEST_CT  1
+static tTestDesc aIrix_Socklen_TTests[] = {
+  { TT_EGREP,    zIrix_Socklen_TSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Irix_Socklen_T
+ */
+static const char* apzIrix_Socklen_TPatch[] = {
+    "format",
+    "%1#if _NO_XOPEN4 && _NO_XOPEN5\n\
+typedef int socklen_t;\n\
+#else\n\
+%2\n\
+#endif /* _NO_XOPEN4 && _NO_XOPEN5 */",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Irix_Stdio_Va_List fix
  */
-#define IRIX_STDIO_VA_LIST_FIXIDX        58
 tSCC zIrix_Stdio_Va_ListName[] =
      "irix_stdio_va_list";
 
@@ -2383,7 +2825,7 @@ tSCC zIrix_Stdio_Va_ListName[] =
  *  File name selection pattern
  */
 tSCC zIrix_Stdio_Va_ListList[] =
-  "|stdio.h|";
+  "|stdio.h|internal/stdio_core.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2393,7 +2835,7 @@ tSCC zIrix_Stdio_Va_ListList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zIrix_Stdio_Va_ListSelect0[] =
-       "(printf\\(.*), /\\* va_list \\*/ char \\*";
+       "/\\* va_list \\*/ char \\*";
 
 #define    IRIX_STDIO_VA_LIST_TEST_CT  1
 static tTestDesc aIrix_Stdio_Va_ListTests[] = {
@@ -2404,50 +2846,52 @@ static tTestDesc aIrix_Stdio_Va_ListTests[] = {
  */
 static const char* apzIrix_Stdio_Va_ListPatch[] = {
     "format",
-    "%1, __gnuc_va_list",
+    "__gnuc_va_list",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Irix_Limits_Const fix
+ *  Description of Irix_Wcsftime fix
  */
-#define IRIX_LIMITS_CONST_FIXIDX         59
-tSCC zIrix_Limits_ConstName[] =
-     "irix_limits_const";
+tSCC zIrix_WcsftimeName[] =
+     "irix_wcsftime";
 
 /*
  *  File name selection pattern
  */
-tSCC zIrix_Limits_ConstList[] =
-  "|fixinc-test-limits.h|limits.h|";
+tSCC zIrix_WcsftimeList[] =
+  "|internal/wchar_core.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzIrix_Limits_ConstMachs (const char**)NULL
+tSCC* apzIrix_WcsftimeMachs[] = {
+        "mips-sgi-irix6.5",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zIrix_Limits_ConstSelect0[] =
-       "^extern const ";
+tSCC zIrix_WcsftimeSelect0[] =
+       "#if _NO_XOPEN5\n\
+(extern size_t[ \t]+wcsftime.*const char *.*)";
 
-#define    IRIX_LIMITS_CONST_TEST_CT  1
-static tTestDesc aIrix_Limits_ConstTests[] = {
-  { TT_EGREP,    zIrix_Limits_ConstSelect0, (regex_t*)NULL }, };
+#define    IRIX_WCSFTIME_TEST_CT  1
+static tTestDesc aIrix_WcsftimeTests[] = {
+  { TT_EGREP,    zIrix_WcsftimeSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Irix_Limits_Const
+ *  Fix Command Arguments for Irix_Wcsftime
  */
-static const char* apzIrix_Limits_ConstPatch[] = {
+static const char* apzIrix_WcsftimePatch[] = {
     "format",
-    "extern __const ",
+    "#if _NO_XOPEN5 && !defined(__c99)\n\
+%1",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Isc_Fmod fix
  */
-#define ISC_FMOD_FIXIDX                  60
 tSCC zIsc_FmodName[] =
      "isc_fmod";
 
@@ -2479,11 +2923,45 @@ static const char* apzIsc_FmodPatch[] = {
     "fmod(double, double)",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Isc_Omits_With_Stdc fix
+ */
+tSCC zIsc_Omits_With_StdcName[] =
+     "isc_omits_with_stdc";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIsc_Omits_With_StdcList[] =
+  "|stdio.h|math.h|ctype.h|sys/limits.h|sys/fcntl.h|sys/dirent.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIsc_Omits_With_StdcMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIsc_Omits_With_StdcSelect0[] =
+       "!defined\\(__STDC__\\) && !defined\\(_POSIX_SOURCE\\)";
+
+#define    ISC_OMITS_WITH_STDC_TEST_CT  1
+static tTestDesc aIsc_Omits_With_StdcTests[] = {
+  { TT_EGREP,    zIsc_Omits_With_StdcSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Isc_Omits_With_Stdc
+ */
+static const char* apzIsc_Omits_With_StdcPatch[] = {
+    "format",
+    "!defined(_POSIX_SOURCE)",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Kandr_Concat fix
  */
-#define KANDR_CONCAT_FIXIDX              61
 tSCC zKandr_ConcatName[] =
      "kandr_concat";
 
@@ -2515,11 +2993,47 @@ static const char* apzKandr_ConcatPatch[] = {
     "##",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Libc1_G_Va_List fix
+ */
+tSCC zLibc1_G_Va_ListName[] =
+     "libc1_G_va_list";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zLibc1_G_Va_ListList[] =
+  "|_G_config.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzLibc1_G_Va_ListMachs[] = {
+        "*-*-linux*libc1",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zLibc1_G_Va_ListSelect0[] =
+       "typedef void \\* _G_va_list;";
+
+#define    LIBC1_G_VA_LIST_TEST_CT  1
+static tTestDesc aLibc1_G_Va_ListTests[] = {
+  { TT_EGREP,    zLibc1_G_Va_ListSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Libc1_G_Va_List
+ */
+static const char* apzLibc1_G_Va_ListPatch[] = {
+    "format",
+    "typedef __builtin_va_list _G_va_list;",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Libc1_Ifdefd_Memx fix
  */
-#define LIBC1_IFDEFD_MEMX_FIXIDX         62
 tSCC zLibc1_Ifdefd_MemxName[] =
      "libc1_ifdefd_memx";
 
@@ -2568,7 +3082,6 @@ extern [a-z_]+ mem.*(\n\
  *
  *  Description of Limits_Ifndefs fix
  */
-#define LIMITS_IFNDEFS_FIXIDX            63
 tSCC zLimits_IfndefsName[] =
      "limits_ifndefs";
 
@@ -2582,15 +3095,22 @@ tSCC zLimits_IfndefsList[] =
  */
 #define apzLimits_IfndefsMachs (const char**)NULL
 
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zLimits_IfndefsSelect0[] =
+       "^[ \t]*#[ \t]*define[ \t]+((FLT|DBL)_(MIN|MAX|DIG))[ \t].*";
+
 /*
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zLimits_IfndefsBypass0[] =
-       "ifndef[ \t]+FLT_MIN";
+       "ifndef[ \t]+FLT_(MIN|MAX)";
 
-#define    LIMITS_IFNDEFS_TEST_CT  1
+#define    LIMITS_IFNDEFS_TEST_CT  2
 static tTestDesc aLimits_IfndefsTests[] = {
-  { TT_NEGREP,   zLimits_IfndefsBypass0, (regex_t*)NULL }, };
+  { TT_NEGREP,   zLimits_IfndefsBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zLimits_IfndefsSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Limits_Ifndefs
@@ -2600,212 +3120,83 @@ static const char* apzLimits_IfndefsPatch[] = {
     "#ifndef %1\n\
 %0\n\
 #endif",
-    "^[ \t]*#[ \t]*define[ \t]+((FLT|DBL)_(MIN|MAX|DIG))[ \t].*",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Lynx_Void_Int fix
  */
-#define LYNX_VOID_INT_FIXIDX             64
-tSCC zLynx_Void_IntName[] =
-     "lynx_void_int";
-
-/*
- *  File name selection pattern
- */
-tSCC zLynx_Void_IntList[] =
-  "|curses.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzLynx_Void_IntMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zLynx_Void_IntSelect0[] =
-       "#[ \t]*define[ \t]+void[ \t]+int[ \t]*";
-
-#define    LYNX_VOID_INT_TEST_CT  1
-static tTestDesc aLynx_Void_IntTests[] = {
-  { TT_EGREP,    zLynx_Void_IntSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Lynx_Void_Int
- */
-static const char* apzLynx_Void_IntPatch[] = {
-    "format",
-    "",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Lynxos_Fcntl_Proto fix
- */
-#define LYNXOS_FCNTL_PROTO_FIXIDX        65
-tSCC zLynxos_Fcntl_ProtoName[] =
-     "lynxos_fcntl_proto";
-
-/*
- *  File name selection pattern
- */
-tSCC zLynxos_Fcntl_ProtoList[] =
-  "|fcntl.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzLynxos_Fcntl_ProtoMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zLynxos_Fcntl_ProtoSelect0[] =
-       "fcntl[ \t]*\\(int, int, int\\)";
-
-#define    LYNXOS_FCNTL_PROTO_TEST_CT  1
-static tTestDesc aLynxos_Fcntl_ProtoTests[] = {
-  { TT_EGREP,    zLynxos_Fcntl_ProtoSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Lynxos_Fcntl_Proto
- */
-static const char* apzLynxos_Fcntl_ProtoPatch[] = {
-    "format",
-    "%1...)",
-    "(fcntl[ \t]*\\(int, int, )int\\)",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of M88k_Bad_Hypot_Opt fix
- */
-#define M88K_BAD_HYPOT_OPT_FIXIDX        66
-tSCC zM88k_Bad_Hypot_OptName[] =
-     "m88k_bad_hypot_opt";
-
-/*
- *  File name selection pattern
- */
-tSCC zM88k_Bad_Hypot_OptList[] =
-  "|math.h|";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzM88k_Bad_Hypot_OptMachs[] = {
-        "m88k-motorola-sysv3*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zM88k_Bad_Hypot_OptSelect0[] =
-       "^extern double hypot\\(\\);\n";
-
-#define    M88K_BAD_HYPOT_OPT_TEST_CT  1
-static tTestDesc aM88k_Bad_Hypot_OptTests[] = {
-  { TT_EGREP,    zM88k_Bad_Hypot_OptSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for M88k_Bad_Hypot_Opt
- */
-static const char* apzM88k_Bad_Hypot_OptPatch[] = {
-    "format",
-    "%0/* Workaround a stupid Motorola optimization if one\n\
-   of x or y is 0.0 and the other is negative!  */\n\
-#ifdef __STDC__\n\
-static __inline__ double fake_hypot (double x, double y)\n\
-#else\n\
-static __inline__ double fake_hypot (x, y)\n\
-\tdouble x, y;\n\
-#endif\n\
-{\n\
-\treturn fabs (hypot (x, y));\n\
-}\n\
-#define hypot\tfake_hypot\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of M88k_Bad_S_If fix
- */
-#define M88K_BAD_S_IF_FIXIDX             67
-tSCC zM88k_Bad_S_IfName[] =
-     "m88k_bad_s_if";
+tSCC zLynx_Void_IntName[] =
+     "lynx_void_int";
 
 /*
  *  File name selection pattern
  */
-tSCC zM88k_Bad_S_IfList[] =
-  "|sys/stat.h|";
+tSCC zLynx_Void_IntList[] =
+  "|curses.h|";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzM88k_Bad_S_IfMachs[] = {
-        "m88k-*-sysv3*",
-        (const char*)NULL };
+#define apzLynx_Void_IntMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zM88k_Bad_S_IfSelect0[] =
-       "#define[ \t]+S_IS[A-Z]+\\(m\\)[ \t]+\\(m[ \t]*&";
+tSCC zLynx_Void_IntSelect0[] =
+       "#[ \t]*define[ \t]+void[ \t]+int[ \t]*";
 
-#define    M88K_BAD_S_IF_TEST_CT  1
-static tTestDesc aM88k_Bad_S_IfTests[] = {
-  { TT_EGREP,    zM88k_Bad_S_IfSelect0, (regex_t*)NULL }, };
+#define    LYNX_VOID_INT_TEST_CT  1
+static tTestDesc aLynx_Void_IntTests[] = {
+  { TT_EGREP,    zLynx_Void_IntSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for M88k_Bad_S_If
+ *  Fix Command Arguments for Lynx_Void_Int
  */
-static const char* apzM88k_Bad_S_IfPatch[] = {
+static const char* apzLynx_Void_IntPatch[] = {
     "format",
-    "#define %1(m) (((m) & S_IFMT) == %2)",
-    "#define[ \t]+(S_IS[A-Z]+)\\(m\\)[ \t]+\\(m[ \t]*&[ \t]*(S_IF[A-Z][A-Z][A-Z]+|0[0-9]+)[ \t]*\\)",
+    "",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of M88k_Multi_Incl fix
+ *  Description of Lynxos_Fcntl_Proto fix
  */
-#define M88K_MULTI_INCL_FIXIDX           68
-tSCC zM88k_Multi_InclName[] =
-     "m88k_multi_incl";
+tSCC zLynxos_Fcntl_ProtoName[] =
+     "lynxos_fcntl_proto";
 
 /*
  *  File name selection pattern
  */
-tSCC zM88k_Multi_InclList[] =
-  "|time.h|";
+tSCC zLynxos_Fcntl_ProtoList[] =
+  "|fcntl.h|";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzM88k_Multi_InclMachs[] = {
-        "m88k-tektronix-sysv3*",
-        (const char*)NULL };
+#define apzLynxos_Fcntl_ProtoMachs (const char**)NULL
 
 /*
- *  content bypass pattern - skip fix if pattern found
+ *  content selection pattern - do fix if pattern found
  */
-tSCC zM88k_Multi_InclBypass0[] =
-       "#ifndef";
+tSCC zLynxos_Fcntl_ProtoSelect0[] =
+       "fcntl[ \t]*\\(int, int, int\\)";
 
-#define    M88K_MULTI_INCL_TEST_CT  1
-static tTestDesc aM88k_Multi_InclTests[] = {
-  { TT_NEGREP,   zM88k_Multi_InclBypass0, (regex_t*)NULL }, };
+#define    LYNXOS_FCNTL_PROTO_TEST_CT  1
+static tTestDesc aLynxos_Fcntl_ProtoTests[] = {
+  { TT_EGREP,    zLynxos_Fcntl_ProtoSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for M88k_Multi_Incl
+ *  Fix Command Arguments for Lynxos_Fcntl_Proto
  */
-static const char* apzM88k_Multi_InclPatch[] = {
-    "wrap",
+static const char* apzLynxos_Fcntl_ProtoPatch[] = {
+    "format",
+    "%1...)",
+    "(fcntl[ \t]*\\(int, int, )int\\)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Machine_Ansi_H_Va_List fix
  */
-#define MACHINE_ANSI_H_VA_LIST_FIXIDX    69
 tSCC zMachine_Ansi_H_Va_ListName[] =
      "machine_ansi_h_va_list";
 
@@ -2848,7 +3239,6 @@ static const char* apzMachine_Ansi_H_Va_ListPatch[] = {
  *
  *  Description of Machine_Name fix
  */
-#define MACHINE_NAME_FIXIDX              70
 tSCC zMachine_NameName[] =
      "machine_name";
 
@@ -2881,7 +3271,6 @@ static const char* apzMachine_NamePatch[] = {
  *
  *  Description of Math_Exception fix
  */
-#define MATH_EXCEPTION_FIXIDX            71
 tSCC zMath_ExceptionName[] =
      "math_exception";
 
@@ -2905,7 +3294,7 @@ tSCC zMath_ExceptionSelect0[] =
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zMath_ExceptionBypass0[] =
-       "We have a problem when using C\\+\\+";
+       "__cplusplus";
 
 #define    MATH_EXCEPTION_TEST_CT  2
 static tTestDesc aMath_ExceptionTests[] = {
@@ -2929,7 +3318,6 @@ static const char* apzMath_ExceptionPatch[] = {
  *
  *  Description of Math_Huge_Val_From_Dbl_Max fix
  */
-#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 72
 tSCC zMath_Huge_Val_From_Dbl_MaxName[] =
      "math_huge_val_from_dbl_max";
 
@@ -2975,7 +3363,6 @@ static const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c",
  *
  *  Description of Math_Huge_Val_Ifndef fix
  */
-#define MATH_HUGE_VAL_IFNDEF_FIXIDX      73
 tSCC zMath_Huge_Val_IfndefName[] =
      "math_huge_val_ifndef";
 
@@ -3010,11 +3397,45 @@ static const char* apzMath_Huge_Val_IfndefPatch[] = {
     "^[ \t]*#[ \t]*define[ \t]+HUGE_VAL[ \t].*",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Nested_Auth_Des fix
+ */
+tSCC zNested_Auth_DesName[] =
+     "nested_auth_des";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zNested_Auth_DesList[] =
+  "|rpc/rpc.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzNested_Auth_DesMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zNested_Auth_DesSelect0[] =
+       "(/\\*.*rpc/auth_des\\.h>.*)/\\*";
+
+#define    NESTED_AUTH_DES_TEST_CT  1
+static tTestDesc aNested_Auth_DesTests[] = {
+  { TT_EGREP,    zNested_Auth_DesSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Nested_Auth_Des
+ */
+static const char* apzNested_Auth_DesPatch[] = {
+    "format",
+    "%1*/ /*",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Nested_Motorola fix
  */
-#define NESTED_MOTOROLA_FIXIDX           74
 tSCC zNested_MotorolaName[] =
      "nested_motorola";
 
@@ -3052,7 +3473,6 @@ static const char* apzNested_MotorolaPatch[] = { "sed",
  *
  *  Description of Nested_Sys_Limits fix
  */
-#define NESTED_SYS_LIMITS_FIXIDX         75
 tSCC zNested_Sys_LimitsName[] =
      "nested_sys_limits";
 
@@ -3086,83 +3506,45 @@ static const char* apzNested_Sys_LimitsPatch[] = { "sed",
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Nested_Auth_Des fix
- */
-#define NESTED_AUTH_DES_FIXIDX           76
-tSCC zNested_Auth_DesName[] =
-     "nested_auth_des";
-
-/*
- *  File name selection pattern
- */
-tSCC zNested_Auth_DesList[] =
-  "|rpc/rpc.h|";
-/*
- *  Machine/OS name selection pattern
- */
-#define apzNested_Auth_DesMachs (const char**)NULL
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zNested_Auth_DesSelect0[] =
-       "(/\\*.*rpc/auth_des\\.h>.*)/\\*";
-
-#define    NESTED_AUTH_DES_TEST_CT  1
-static tTestDesc aNested_Auth_DesTests[] = {
-  { TT_EGREP,    zNested_Auth_DesSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Nested_Auth_Des
- */
-static const char* apzNested_Auth_DesPatch[] = {
-    "format",
-    "%1*/ /*",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of News_Os_Recursion fix
+ *  Description of Netbsd_Extra_Semicolon fix
  */
-#define NEWS_OS_RECURSION_FIXIDX         77
-tSCC zNews_Os_RecursionName[] =
-     "news_os_recursion";
+tSCC zNetbsd_Extra_SemicolonName[] =
+     "netbsd_extra_semicolon";
 
 /*
  *  File name selection pattern
  */
-tSCC zNews_Os_RecursionList[] =
-  "|stdlib.h|";
+tSCC zNetbsd_Extra_SemicolonList[] =
+  "|sys/cdefs.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzNews_Os_RecursionMachs (const char**)NULL
+tSCC* apzNetbsd_Extra_SemicolonMachs[] = {
+        "*-*-netbsd*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zNews_Os_RecursionSelect0[] =
-       "[ \t]*#include <stdlib\\.h>.*";
+tSCC zNetbsd_Extra_SemicolonSelect0[] =
+       "#define[ \t]*__END_DECLS[ \t]*};";
 
-#define    NEWS_OS_RECURSION_TEST_CT  1
-static tTestDesc aNews_Os_RecursionTests[] = {
-  { TT_EGREP,    zNews_Os_RecursionSelect0, (regex_t*)NULL }, };
+#define    NETBSD_EXTRA_SEMICOLON_TEST_CT  1
+static tTestDesc aNetbsd_Extra_SemicolonTests[] = {
+  { TT_EGREP,    zNetbsd_Extra_SemicolonSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for News_Os_Recursion
+ *  Fix Command Arguments for Netbsd_Extra_Semicolon
  */
-static const char* apzNews_Os_RecursionPatch[] = {
+static const char* apzNetbsd_Extra_SemicolonPatch[] = {
     "format",
-    "#ifdef BOGUS_RECURSION\n\
-%0\n\
-#endif",
+    "#define __END_DECLS }",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Next_Math_Prefix fix
  */
-#define NEXT_MATH_PREFIX_FIXIDX          78
 tSCC zNext_Math_PrefixName[] =
      "next_math_prefix";
 
@@ -3199,7 +3581,6 @@ static const char* apzNext_Math_PrefixPatch[] = {
  *
  *  Description of Next_Template fix
  */
-#define NEXT_TEMPLATE_FIXIDX             79
 tSCC zNext_TemplateName[] =
      "next_template";
 
@@ -3236,7 +3617,6 @@ static const char* apzNext_TemplatePatch[] = {
  *
  *  Description of Next_Volitile fix
  */
-#define NEXT_VOLITILE_FIXIDX             80
 tSCC zNext_VolitileName[] =
      "next_volitile";
 
@@ -3273,7 +3653,6 @@ static const char* apzNext_VolitilePatch[] = {
  *
  *  Description of Next_Wait_Union fix
  */
-#define NEXT_WAIT_UNION_FIXIDX           81
 tSCC zNext_Wait_UnionName[] =
      "next_wait_union";
 
@@ -3309,7 +3688,6 @@ static const char* apzNext_Wait_UnionPatch[] = {
  *
  *  Description of Nodeent_Syntax fix
  */
-#define NODEENT_SYNTAX_FIXIDX            82
 tSCC zNodeent_SyntaxName[] =
      "nodeent_syntax";
 
@@ -3341,11 +3719,45 @@ static const char* apzNodeent_SyntaxPatch[] = {
     "%0;",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Obstack_Lvalue_Cast fix
+ */
+tSCC zObstack_Lvalue_CastName[] =
+     "obstack_lvalue_cast";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zObstack_Lvalue_CastList[] =
+  "|obstack.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzObstack_Lvalue_CastMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zObstack_Lvalue_CastSelect0[] =
+       "\\*\\(\\(([^()]*)\\*\\)(.*)\\)\\+\\+ = \\(([^()]*)\\)";
+
+#define    OBSTACK_LVALUE_CAST_TEST_CT  1
+static tTestDesc aObstack_Lvalue_CastTests[] = {
+  { TT_EGREP,    zObstack_Lvalue_CastSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Obstack_Lvalue_Cast
+ */
+static const char* apzObstack_Lvalue_CastPatch[] = {
+    "format",
+    "((*((%1*)%2) = (%3)), (%2 += sizeof (%1)))",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Osf_Namespace_A fix
  */
-#define OSF_NAMESPACE_A_FIXIDX           83
 tSCC zOsf_Namespace_AName[] =
      "osf_namespace_a";
 
@@ -3391,7 +3803,6 @@ static const char* apzOsf_Namespace_APatch[] = {
  *
  *  Description of Osf_Namespace_C fix
  */
-#define OSF_NAMESPACE_C_FIXIDX           84
 tSCC zOsf_Namespace_CName[] =
      "osf_namespace_c";
 
@@ -3446,7 +3857,6 @@ typedef __regmatch_t\tregmatch_t;",
  *
  *  Description of Pthread_Page_Size fix
  */
-#define PTHREAD_PAGE_SIZE_FIXIDX         85
 tSCC zPthread_Page_SizeName[] =
      "pthread_page_size";
 
@@ -3482,7 +3892,6 @@ static const char* apzPthread_Page_SizePatch[] = {
  *
  *  Description of Read_Ret_Type fix
  */
-#define READ_RET_TYPE_FIXIDX             86
 tSCC zRead_Ret_TypeName[] =
      "read_ret_type";
 
@@ -3520,7 +3929,6 @@ static const char* apzRead_Ret_TypePatch[] = {
  *
  *  Description of Rs6000_Double fix
  */
-#define RS6000_DOUBLE_FIXIDX             87
 tSCC zRs6000_DoubleName[] =
      "rs6000_double";
 
@@ -3559,7 +3967,6 @@ static const char* apzRs6000_DoublePatch[] = {
  *
  *  Description of Rs6000_Fchmod fix
  */
-#define RS6000_FCHMOD_FIXIDX             88
 tSCC zRs6000_FchmodName[] =
      "rs6000_fchmod";
 
@@ -3595,7 +4002,6 @@ static const char* apzRs6000_FchmodPatch[] = {
  *
  *  Description of Rs6000_Param fix
  */
-#define RS6000_PARAM_FIXIDX              89
 tSCC zRs6000_ParamName[] =
      "rs6000_param";
 
@@ -3627,11 +4033,94 @@ static const char* apzRs6000_ParamPatch[] = {
     "rename(const char *_old, const char *_new)",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Sco_Math fix
+ */
+tSCC zSco_MathName[] =
+     "sco_math";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSco_MathList[] =
+  "|math.h|ansi/math.h|posix/math.h|xpg4/math.h|xpg4v2/math.h|xpg4plus/math.h|ods_30_compat/math.h|oldstyle/math.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSco_MathMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSco_MathSelect0[] =
+       "inline double abs";
+
+#define    SCO_MATH_TEST_CT  1
+static tTestDesc aSco_MathTests[] = {
+  { TT_EGREP,    zSco_MathSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Sco_Math
+ */
+static const char* apzSco_MathPatch[] = { "sed",
+    "-e", "/#define.*__fp_class(a) \\\\/i\\\n\
+#ifndef __GNUC__\n",
+    "-e", "/.*__builtin_generic/a\\\n\
+#else\\\n\
+#define __fp_class(a) \\\\\\\n\
+  __builtin_choose_expr(__builtin_types_compatible_p(typeof(a),long double),\\\\\\\n\
+   __fpclassifyl(a), \\\\\\\n\
+    __builtin_choose_expr(__builtin_types_compatible_p(typeof(a), float), \\\\\\\n\
+      __fpclassifyf(a),__fpclassify(a)))\\\n\
+#endif",
+    "-e", "/extern \"C\\+\\+\"/N;/inline double abs/i\\\n\
+#ifndef __GNUC__\n",
+    "-e", "/inline long double trunc/N;/inline long double trunc.*}.*extern \"C\\+\\+\"/a\\\n\
+#endif /* ! __GNUC__ */",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Sco_Regset fix
+ */
+tSCC zSco_RegsetName[] =
+     "sco_regset";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSco_RegsetList[] =
+  "|sys/regset.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzSco_RegsetMachs[] = {
+        "*-*-sco3.2v5*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSco_RegsetSelect0[] =
+       "(struct[ \t]+.*)fpstate";
+
+#define    SCO_REGSET_TEST_CT  1
+static tTestDesc aSco_RegsetTests[] = {
+  { TT_EGREP,    zSco_RegsetSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Sco_Regset
+ */
+static const char* apzSco_RegsetPatch[] = {
+    "format",
+    "%1rsfpstate",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Sco_Static_Func fix
  */
-#define SCO_STATIC_FUNC_FIXIDX           90
 tSCC zSco_Static_FuncName[] =
      "sco_static_func";
 
@@ -3673,208 +4162,280 @@ extern \"C\" {\\\n\
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Strict_Ansi_Not fix
+ *  Description of Sco_Utime fix
  */
-#define STRICT_ANSI_NOT_FIXIDX           91
-tSCC zStrict_Ansi_NotName[] =
-     "strict_ansi_not";
+tSCC zSco_UtimeName[] =
+     "sco_utime";
 
 /*
  *  File name selection pattern
  */
-#define zStrict_Ansi_NotList (char*)NULL
+tSCC zSco_UtimeList[] =
+  "|sys/times.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzStrict_Ansi_NotMachs (const char**)NULL
+tSCC* apzSco_UtimeMachs[] = {
+        "i?86-*-sco3.2v4*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zStrict_Ansi_NotSelect0[] =
-       "^([ \t]*#[ \t]*if.*)(!__STDC__|__STDC__[ \t]*==[ \t]*0|__STDC__[ \t]*!=[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)(.*)";
+tSCC zSco_UtimeSelect0[] =
+       "\\(const char \\*, struct utimbuf \\*\\);";
+
+#define    SCO_UTIME_TEST_CT  1
+static tTestDesc aSco_UtimeTests[] = {
+  { TT_EGREP,    zSco_UtimeSelect0, (regex_t*)NULL }, };
 
 /*
- *  perform the C function call test
+ *  Fix Command Arguments for Sco_Utime
  */
-tSCC zStrict_Ansi_NotFTst0[] = "stdc_0_in_system_headers";
+static const char* apzSco_UtimePatch[] = {
+    "format",
+    "(const char *, const struct utimbuf *);",
+    (char*)NULL };
 
-#define    STRICT_ANSI_NOT_TEST_CT  2
-static tTestDesc aStrict_Ansi_NotTests[] = {
-  { TT_FUNCTION, zStrict_Ansi_NotFTst0,   0 /* unused */ },
-  { TT_EGREP,    zStrict_Ansi_NotSelect0, (regex_t*)NULL }, };
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Solaris_Mutex_Init_1 fix
+ */
+tSCC zSolaris_Mutex_Init_1Name[] =
+     "solaris_mutex_init_1";
 
 /*
- *  Fix Command Arguments for Strict_Ansi_Not
+ *  File name selection pattern
  */
-static const char* apzStrict_Ansi_NotPatch[] = {
-    "format",
-    "%1 !defined(__STRICT_ANSI__)%3",
+tSCC zSolaris_Mutex_Init_1List[] =
+  "|pthread.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSolaris_Mutex_Init_1Machs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Mutex_Init_1Select0[] =
+       "@\\(#\\)pthread.h[ \t]+1.1[0-9][ \t]+9[567]/[0-9/]+ SMI";
+
+#define    SOLARIS_MUTEX_INIT_1_TEST_CT  1
+static tTestDesc aSolaris_Mutex_Init_1Tests[] = {
+  { TT_EGREP,    zSolaris_Mutex_Init_1Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Solaris_Mutex_Init_1
+ */
+static const char* apzSolaris_Mutex_Init_1Patch[] = { "sed",
+    "-e", "/define[ \t]*PTHREAD_MUTEX_INI/s/{0, 0,/{{{0}, 0}, {{{0}}},/\n\
+/define[ \t]*PTHREAD_COND_INI/s/{0,/{{{0},0},/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Strict_Ansi_Not_Ctd fix
+ *  Description of Solaris_Mutex_Init_2 fix
  */
-#define STRICT_ANSI_NOT_CTD_FIXIDX       92
-tSCC zStrict_Ansi_Not_CtdName[] =
-     "strict_ansi_not_ctd";
+tSCC zSolaris_Mutex_Init_2Name[] =
+     "solaris_mutex_init_2";
 
 /*
  *  File name selection pattern
  */
-tSCC zStrict_Ansi_Not_CtdList[] =
-  "|math.h|limits.h|stdio.h|signal.h|stdlib.h|time.h|";
+tSCC zSolaris_Mutex_Init_2List[] =
+  "|pthread.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzStrict_Ansi_Not_CtdMachs (const char**)NULL
+#define apzSolaris_Mutex_Init_2Machs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zStrict_Ansi_Not_CtdSelect0[] =
-       "^([ \t]*[|&][|&][ \t(]*)(__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)(.*)";
+tSCC zSolaris_Mutex_Init_2Select0[] =
+       "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
+
+#define    SOLARIS_MUTEX_INIT_2_TEST_CT  1
+static tTestDesc aSolaris_Mutex_Init_2Tests[] = {
+  { TT_EGREP,    zSolaris_Mutex_Init_2Select0, (regex_t*)NULL }, };
 
 /*
- *  perform the C function call test
+ *  Fix Command Arguments for Solaris_Mutex_Init_2
  */
-tSCC zStrict_Ansi_Not_CtdFTst0[] = "stdc_0_in_system_headers";
+static const char* apzSolaris_Mutex_Init_2Patch[] = {
+    "format",
+    "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\
+%0\n\
+#else\n\
+%1, {0}}%3\n\
+#endif",
+    "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+\\{.*),[ \t]*0\\}(|[ \t].*)$",
+    (char*)NULL };
 
-#define    STRICT_ANSI_NOT_CTD_TEST_CT  2
-static tTestDesc aStrict_Ansi_Not_CtdTests[] = {
-  { TT_FUNCTION, zStrict_Ansi_Not_CtdFTst0,   0 /* unused */ },
-  { TT_EGREP,    zStrict_Ansi_Not_CtdSelect0, (regex_t*)NULL }, };
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Solaris_Socket fix
+ */
+tSCC zSolaris_SocketName[] =
+     "solaris_socket";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSolaris_SocketList[] =
+  "|sys/socket.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSolaris_SocketMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_SocketSelect0[] =
+       "@\\(#\\)socket.h[ \t]+1.[123][0-9][ \t]+9[567]/[0-9/]+ SMI";
+
+#define    SOLARIS_SOCKET_TEST_CT  1
+static tTestDesc aSolaris_SocketTests[] = {
+  { TT_EGREP,    zSolaris_SocketSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Strict_Ansi_Not_Ctd
+ *  Fix Command Arguments for Solaris_Socket
  */
-static const char* apzStrict_Ansi_Not_CtdPatch[] = {
+static const char* apzSolaris_SocketPatch[] = {
     "format",
-    "%1 !defined(__STRICT_ANSI__)%3",
+    "extern int %1(int, %2void *, int, int);",
+    "^extern int (recv|send)\\(int, (const )*char \\*, int, int\\);",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Strict_Ansi_Only fix
+ *  Description of Solaris_Stdio_Tag fix
  */
-#define STRICT_ANSI_ONLY_FIXIDX          93
-tSCC zStrict_Ansi_OnlyName[] =
-     "strict_ansi_only";
+tSCC zSolaris_Stdio_TagName[] =
+     "solaris_stdio_tag";
 
 /*
  *  File name selection pattern
  */
-#define zStrict_Ansi_OnlyList (char*)NULL
+tSCC zSolaris_Stdio_TagList[] =
+  "|stdio_tag.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzStrict_Ansi_OnlyMachs (const char**)NULL
+#define apzSolaris_Stdio_TagMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zStrict_Ansi_OnlySelect0[] =
-       "^([ \t]*#[ \t]*if.*)(__STDC__[ \t]*!=[ \t]*0|__STDC__[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*!=[ \t]*0)(.*)";
-
-/*
- *  perform the C function call test
- */
-tSCC zStrict_Ansi_OnlyFTst0[] = "stdc_0_in_system_headers";
+tSCC zSolaris_Stdio_TagSelect0[] =
+       "__cplusplus < 54321L";
 
-#define    STRICT_ANSI_ONLY_TEST_CT  2
-static tTestDesc aStrict_Ansi_OnlyTests[] = {
-  { TT_FUNCTION, zStrict_Ansi_OnlyFTst0,   0 /* unused */ },
-  { TT_EGREP,    zStrict_Ansi_OnlySelect0, (regex_t*)NULL }, };
+#define    SOLARIS_STDIO_TAG_TEST_CT  1
+static tTestDesc aSolaris_Stdio_TagTests[] = {
+  { TT_EGREP,    zSolaris_Stdio_TagSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Strict_Ansi_Only
+ *  Fix Command Arguments for Solaris_Stdio_Tag
  */
-static const char* apzStrict_Ansi_OnlyPatch[] = {
-    "format",
-    "%1 defined(__STRICT_ANSI__)%3",
+static const char* apzSolaris_Stdio_TagPatch[] = { "sed",
+    "-e", "s/defined(__cplusplus) && (__cplusplus < 54321L)/0/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Sco_Utime fix
+ *  Description of Solaris_Unistd fix
  */
-#define SCO_UTIME_FIXIDX                 94
-tSCC zSco_UtimeName[] =
-     "sco_utime";
+tSCC zSolaris_UnistdName[] =
+     "solaris_unistd";
 
 /*
  *  File name selection pattern
  */
-tSCC zSco_UtimeList[] =
-  "|sys/times.h|";
+tSCC zSolaris_UnistdList[] =
+  "|unistd.h|";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzSco_UtimeMachs[] = {
-        "i?86-*-sco3.2v4*",
-        (const char*)NULL };
+#define apzSolaris_UnistdMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSco_UtimeSelect0[] =
-       "\\(const char \\*, struct utimbuf \\*\\);";
+tSCC zSolaris_UnistdSelect0[] =
+       "@\\(#\\)unistd.h[ \t]+1.3[0-9][ \t]+9[567]/[0-9/]+ SMI";
 
-#define    SCO_UTIME_TEST_CT  1
-static tTestDesc aSco_UtimeTests[] = {
-  { TT_EGREP,    zSco_UtimeSelect0, (regex_t*)NULL }, };
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_UnistdBypass0[] =
+       "getpagesize";
+
+#define    SOLARIS_UNISTD_TEST_CT  2
+static tTestDesc aSolaris_UnistdTests[] = {
+  { TT_NEGREP,   zSolaris_UnistdBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_UnistdSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Sco_Utime
+ *  Fix Command Arguments for Solaris_Unistd
  */
-static const char* apzSco_UtimePatch[] = {
+static const char* apzSolaris_UnistdPatch[] = {
     "format",
-    "(const char *, const struct utimbuf *);",
+    "extern int getpagesize();\n\
+%0",
+    "^extern (pid_t|int) getpgid\\(.*\\);",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Solaris27_Mutex_Init fix
+ *  Description of Solaris_Widec fix
  */
-#define SOLARIS27_MUTEX_INIT_FIXIDX      95
-tSCC zSolaris27_Mutex_InitName[] =
-     "solaris27_mutex_init";
+tSCC zSolaris_WidecName[] =
+     "solaris_widec";
 
 /*
  *  File name selection pattern
  */
-tSCC zSolaris27_Mutex_InitList[] =
-  "|pthread.h|";
+tSCC zSolaris_WidecList[] =
+  "|widec.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzSolaris27_Mutex_InitMachs (const char**)NULL
+tSCC* apzSolaris_WidecMachs[] = {
+        "*-*-solaris2.[0-5]",
+        "*-*-solaris2.[0-5].*",
+        (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zSolaris27_Mutex_InitSelect0[] =
-       "@\\(#\\)pthread.h[ \t]+1.26[ \t]+98/04/12 SMI";
+tSCC zSolaris_WidecSelect0[] =
+       "#include <euc.h>";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSolaris_WidecBypass0[] =
+       "include.*wchar\\.h";
 
-#define    SOLARIS27_MUTEX_INIT_TEST_CT  1
-static tTestDesc aSolaris27_Mutex_InitTests[] = {
-  { TT_EGREP,    zSolaris27_Mutex_InitSelect0, (regex_t*)NULL }, };
+#define    SOLARIS_WIDEC_TEST_CT  2
+static tTestDesc aSolaris_WidecTests[] = {
+  { TT_NEGREP,   zSolaris_WidecBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSolaris_WidecSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Solaris27_Mutex_Init
+ *  Fix Command Arguments for Solaris_Widec
  */
-static const char* apzSolaris27_Mutex_InitPatch[] = {
+static const char* apzSolaris_WidecPatch[] = {
     "format",
-    "%1, {0}}",
-    "(define[ \t]+PTHREAD_MUTEX_INITIALIZER.*),[ \t]*0}$",
+    "%0\n\
+#include <wchar.h>",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Statsswtch fix
  */
-#define STATSSWTCH_FIXIDX                96
 tSCC zStatsswtchName[] =
      "statsswtch";
 
@@ -3910,7 +4471,6 @@ static const char* apzStatsswtchPatch[] = {
  *
  *  Description of Stdio_Stdarg_H fix
  */
-#define STDIO_STDARG_H_FIXIDX            97
 tSCC zStdio_Stdarg_HName[] =
      "stdio_stdarg_h";
 
@@ -3947,7 +4507,6 @@ static const char* apzStdio_Stdarg_HPatch[] = {
  *
  *  Description of Stdio_Va_List fix
  */
-#define STDIO_VA_LIST_FIXIDX             98
 tSCC zStdio_Va_ListName[] =
      "stdio_va_list";
 
@@ -3955,7 +4514,7 @@ tSCC zStdio_Va_ListName[] =
  *  File name selection pattern
  */
 tSCC zStdio_Va_ListList[] =
-  "|stdio.h|";
+  "|stdio.h|internal/stdio_core.h|internal/wchar_core.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3965,7 +4524,7 @@ tSCC zStdio_Va_ListList[] =
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zStdio_Va_ListBypass0[] =
-       "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list";
+       "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list";
 
 #define    STDIO_VA_LIST_TEST_CT  1
 static tTestDesc aStdio_Va_ListTests[] = {
@@ -3975,24 +4534,157 @@ static tTestDesc aStdio_Va_ListTests[] = {
  *  Fix Command Arguments for Stdio_Va_List
  */
 static const char* apzStdio_Va_ListPatch[] = { "sed",
-    "-e", "s@ va_list @ __gnuc_va_list @\n\
-s@ va_list)@ __gnuc_va_list)@\n\
+    "-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\
+s@(va_list)&@(__gnuc_va_list)\\&@\n\
 s@ _VA_LIST_));@ __gnuc_va_list));@\n\
+s@ __VA_LIST__));@ __gnuc_va_list));@\n\
 s@ va_list@ __not_va_list__@\n\
 s@\\*va_list@*__not_va_list__@\n\
 s@ __va_list)@ __gnuc_va_list)@\n\
 s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\
+s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n\
 s@GNUC_VA_LIST@GNUC_Va_LIST@\n\
+s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n\
 s@_NEED___VA_LIST@_NEED___Va_LIST@\n\
 s@VA_LIST@DUMMY_VA_LIST@\n\
 s@_Va_LIST@_VA_LIST@",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Strict_Ansi_Not fix
+ */
+tSCC zStrict_Ansi_NotName[] =
+     "strict_ansi_not";
+
+/*
+ *  File name selection pattern
+ */
+#define zStrict_Ansi_NotList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzStrict_Ansi_NotMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zStrict_Ansi_NotSelect0[] =
+       "^([ \t]*#[ \t]*if.*)(!__STDC__|__STDC__[ \t]*==[ \t]*0|__STDC__[ \t]*!=[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0)";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zStrict_Ansi_NotBypass0[] =
+       "GNU and MIPS C compilers define __STDC__ differently";
+tSCC zStrict_Ansi_NotBypass1[] =
+       "__SCO_VERSION__.*__STDC__ != 1";
+
+/*
+ *  perform the C function call test
+ */
+tSCC zStrict_Ansi_NotFTst0[] = "stdc_0_in_system_headers";
+
+#define    STRICT_ANSI_NOT_TEST_CT  4
+static tTestDesc aStrict_Ansi_NotTests[] = {
+  { TT_FUNCTION, zStrict_Ansi_NotFTst0,   0 /* unused */ },
+  { TT_NEGREP,   zStrict_Ansi_NotBypass0, (regex_t*)NULL },
+  { TT_NEGREP,   zStrict_Ansi_NotBypass1, (regex_t*)NULL },
+  { TT_EGREP,    zStrict_Ansi_NotSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Strict_Ansi_Not
+ */
+static const char* apzStrict_Ansi_NotPatch[] = {
+    "format",
+    "%1 !defined(__STRICT_ANSI__)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Strict_Ansi_Not_Ctd fix
+ */
+tSCC zStrict_Ansi_Not_CtdName[] =
+     "strict_ansi_not_ctd";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zStrict_Ansi_Not_CtdList[] =
+  "|math.h|limits.h|stdio.h|signal.h|stdlib.h|sys/signal.h|time.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzStrict_Ansi_Not_CtdMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zStrict_Ansi_Not_CtdSelect0[] =
+       "^([ \t]*(\\(|&&|\\|\\|)([ \t(]*!*[ \t]*defined\\([a-zA-Z_0-9]+\\)[ \t]*[|&][|&])*[ \t(]*)(__STDC__[ \t]*(|-[ \t]*0[ \t]*)==[ \t]*0)";
+
+/*
+ *  perform the C function call test
+ */
+tSCC zStrict_Ansi_Not_CtdFTst0[] = "stdc_0_in_system_headers";
+
+#define    STRICT_ANSI_NOT_CTD_TEST_CT  2
+static tTestDesc aStrict_Ansi_Not_CtdTests[] = {
+  { TT_FUNCTION, zStrict_Ansi_Not_CtdFTst0,   0 /* unused */ },
+  { TT_EGREP,    zStrict_Ansi_Not_CtdSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Strict_Ansi_Not_Ctd
+ */
+static const char* apzStrict_Ansi_Not_CtdPatch[] = {
+    "format",
+    "%1 !defined(__STRICT_ANSI__)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Strict_Ansi_Only fix
+ */
+tSCC zStrict_Ansi_OnlyName[] =
+     "strict_ansi_only";
+
+/*
+ *  File name selection pattern
+ */
+#define zStrict_Ansi_OnlyList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzStrict_Ansi_OnlyMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zStrict_Ansi_OnlySelect0[] =
+       "^([ \t]*#[ \t]*if.*)(__STDC__[ \t]*!=[ \t]*0|__STDC__[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*1|__STDC__[ \t]*-[ \t]*0[ \t]*!=[ \t]*0)";
+
+/*
+ *  perform the C function call test
+ */
+tSCC zStrict_Ansi_OnlyFTst0[] = "stdc_0_in_system_headers";
+
+#define    STRICT_ANSI_ONLY_TEST_CT  2
+static tTestDesc aStrict_Ansi_OnlyTests[] = {
+  { TT_FUNCTION, zStrict_Ansi_OnlyFTst0,   0 /* unused */ },
+  { TT_EGREP,    zStrict_Ansi_OnlySelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Strict_Ansi_Only
+ */
+static const char* apzStrict_Ansi_OnlyPatch[] = {
+    "format",
+    "%1 defined(__STRICT_ANSI__)",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Struct_File fix
  */
-#define STRUCT_FILE_FIXIDX               99
 tSCC zStruct_FileName[] =
      "struct_file";
 
@@ -4029,7 +4721,6 @@ static const char* apzStruct_FilePatch[] = {
  *
  *  Description of Struct_Sockaddr fix
  */
-#define STRUCT_SOCKADDR_FIXIDX           100
 tSCC zStruct_SockaddrName[] =
      "struct_sockaddr";
 
@@ -4047,17 +4738,20 @@ tSCC zStruct_SockaddrList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zStruct_SockaddrSelect0[] =
-       "^.*authdes_create.*struct sockaddr";
+       "^.*authdes_create.*struct sockaddr[^_]";
 
 /*
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zStruct_SockaddrBypass0[] =
        "<sys/socket.h>";
+tSCC zStruct_SockaddrBypass1[] =
+       "struct sockaddr;\n";
 
-#define    STRUCT_SOCKADDR_TEST_CT  2
+#define    STRUCT_SOCKADDR_TEST_CT  3
 static tTestDesc aStruct_SockaddrTests[] = {
   { TT_NEGREP,   zStruct_SockaddrBypass0, (regex_t*)NULL },
+  { TT_NEGREP,   zStruct_SockaddrBypass1, (regex_t*)NULL },
   { TT_EGREP,    zStruct_SockaddrSelect0, (regex_t*)NULL }, };
 
 /*
@@ -4073,7 +4767,6 @@ static const char* apzStruct_SockaddrPatch[] = {
  *
  *  Description of Sun_Auth_Proto fix
  */
-#define SUN_AUTH_PROTO_FIXIDX            101
 tSCC zSun_Auth_ProtoName[] =
      "sun_auth_proto";
 
@@ -4114,7 +4807,6 @@ static const char* apzSun_Auth_ProtoPatch[] = {
  *
  *  Description of Sun_Bogus_Ifdef fix
  */
-#define SUN_BOGUS_IFDEF_FIXIDX           102
 tSCC zSun_Bogus_IfdefName[] =
      "sun_bogus_ifdef";
 
@@ -4150,7 +4842,6 @@ static const char* apzSun_Bogus_IfdefPatch[] = {
  *
  *  Description of Sun_Catmacro fix
  */
-#define SUN_CATMACRO_FIXIDX              103
 tSCC zSun_CatmacroName[] =
      "sun_catmacro";
 
@@ -4190,7 +4881,6 @@ static const char* apzSun_CatmacroPatch[] = {
  *
  *  Description of Sun_Malloc fix
  */
-#define SUN_MALLOC_FIXIDX                104
 tSCC zSun_MallocName[] =
      "sun_malloc";
 
@@ -4221,7 +4911,6 @@ static const char* apzSun_MallocPatch[] = { "sed",
  *
  *  Description of Sun_Rusers_Semi fix
  */
-#define SUN_RUSERS_SEMI_FIXIDX           105
 tSCC zSun_Rusers_SemiName[] =
      "sun_rusers_semi";
 
@@ -4256,7 +4945,6 @@ static const char* apzSun_Rusers_SemiPatch[] = { "sed",
  *
  *  Description of Sun_Signal fix
  */
-#define SUN_SIGNAL_FIXIDX                106
 tSCC zSun_SignalName[] =
      "sun_signal";
 
@@ -4296,7 +4984,6 @@ void\t(*signal(...))(...);\n\
  *
  *  Description of Sunos_Matherr_Decl fix
  */
-#define SUNOS_MATHERR_DECL_FIXIDX        107
 tSCC zSunos_Matherr_DeclName[] =
      "sunos_matherr_decl";
 
@@ -4339,7 +5026,6 @@ static const char* apzSunos_Matherr_DeclPatch[] = {
  *
  *  Description of Sunos_Strlen fix
  */
-#define SUNOS_STRLEN_FIXIDX              108
 tSCC zSunos_StrlenName[] =
      "sunos_strlen";
 
@@ -4375,7 +5061,6 @@ static const char* apzSunos_StrlenPatch[] = {
  *
  *  Description of Svr4__P fix
  */
-#define SVR4__P_FIXIDX                   109
 tSCC zSvr4__PName[] =
      "svr4__p";
 
@@ -4409,11 +5094,44 @@ static const char* apzSvr4__PPatch[] = {
 #endif",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Svr4_Disable_Opt fix
+ */
+tSCC zSvr4_Disable_OptName[] =
+     "svr4_disable_opt";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSvr4_Disable_OptList[] =
+  "|string.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSvr4_Disable_OptMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSvr4_Disable_OptSelect0[] =
+       "#define.*__std_hdr_";
+
+#define    SVR4_DISABLE_OPT_TEST_CT  1
+static tTestDesc aSvr4_Disable_OptTests[] = {
+  { TT_EGREP,    zSvr4_Disable_OptSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Svr4_Disable_Opt
+ */
+static const char* apzSvr4_Disable_OptPatch[] = { "sed",
+    "-e", "/#define.*__std_hdr_/d",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Svr4_Getcwd fix
  */
-#define SVR4_GETCWD_FIXIDX               110
 tSCC zSvr4_GetcwdName[] =
      "svr4_getcwd";
 
@@ -4445,11 +5163,49 @@ static const char* apzSvr4_GetcwdPatch[] = {
     "getcwd(char *, size_t)",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Svr4_Krnl fix
+ */
+tSCC zSvr4_KrnlName[] =
+     "svr4_krnl";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSvr4_KrnlList[] =
+  "|fs/rfs/rf_cache.h|sys/erec.h|sys/err.h|sys/char.h|sys/getpages.h|sys/map.h|sys/cmn_err.h|sys/kdebugger.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzSvr4_KrnlMachs[] = {
+        "*-*-sysv4*",
+        "i?86-sequent-ptx*",
+        (const char*)NULL };
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSvr4_KrnlBypass0[] =
+       "_KERNEL";
+
+#define    SVR4_KRNL_TEST_CT  1
+static tTestDesc aSvr4_KrnlTests[] = {
+  { TT_NEGREP,   zSvr4_KrnlBypass0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Svr4_Krnl
+ */
+static const char* apzSvr4_KrnlPatch[] = {
+    "wrap",
+    "#ifdef _KERNEL\n",
+    "#endif /* _KERNEL */\n",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Svr4_Profil fix
  */
-#define SVR4_PROFIL_FIXIDX               111
 tSCC zSvr4_ProfilName[] =
      "svr4_profil";
 
@@ -4483,51 +5239,87 @@ static const char* apzSvr4_ProfilPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Gnu_Types fix
+ *  Description of Svr4_Sighandler_Type fix
  */
-#define GNU_TYPES_FIXIDX                 112
-tSCC zGnu_TypesName[] =
-     "gnu_types";
+tSCC zSvr4_Sighandler_TypeName[] =
+     "svr4_sighandler_type";
 
 /*
  *  File name selection pattern
  */
-tSCC zGnu_TypesList[] =
-  "|sys/types.h|stdlib.h|sys/stdtypes.h|stddef.h|memory.h|unistd.h|";
+tSCC zSvr4_Sighandler_TypeList[] =
+  "|sys/signal.h|";
 /*
  *  Machine/OS name selection pattern
  */
-#define apzGnu_TypesMachs (const char**)NULL
+#define apzSvr4_Sighandler_TypeMachs (const char**)NULL
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zGnu_TypesSelect0[] =
-       "^[ \t]*typedef[ \t]+.*[ \t](ptrdiff|size|wchar)_t;";
+tSCC zSvr4_Sighandler_TypeSelect0[] =
+       "void *\\(\\*\\)\\(\\)";
+
+#define    SVR4_SIGHANDLER_TYPE_TEST_CT  1
+static tTestDesc aSvr4_Sighandler_TypeTests[] = {
+  { TT_EGREP,    zSvr4_Sighandler_TypeSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Svr4_Sighandler_Type
+ */
+static const char* apzSvr4_Sighandler_TypePatch[] = {
+    "format",
+    "void (*)(int)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Svr4_Undeclared_Getrnge fix
+ */
+tSCC zSvr4_Undeclared_GetrngeName[] =
+     "svr4_undeclared_getrnge";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSvr4_Undeclared_GetrngeList[] =
+  "|regexp.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzSvr4_Undeclared_GetrngeMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSvr4_Undeclared_GetrngeSelect0[] =
+       "getrnge";
 
 /*
  *  content bypass pattern - skip fix if pattern found
  */
-tSCC zGnu_TypesBypass0[] =
-       "_GCC_(PTRDIFF|SIZE|WCHAR)_T";
+tSCC zSvr4_Undeclared_GetrngeBypass0[] =
+       "static void getrnge";
 
-#define    GNU_TYPES_TEST_CT  2
-static tTestDesc aGnu_TypesTests[] = {
-  { TT_NEGREP,   zGnu_TypesBypass0, (regex_t*)NULL },
-  { TT_EGREP,    zGnu_TypesSelect0, (regex_t*)NULL }, };
+#define    SVR4_UNDECLARED_GETRNGE_TEST_CT  2
+static tTestDesc aSvr4_Undeclared_GetrngeTests[] = {
+  { TT_NEGREP,   zSvr4_Undeclared_GetrngeBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSvr4_Undeclared_GetrngeSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Gnu_Types
+ *  Fix Command Arguments for Svr4_Undeclared_Getrnge
  */
-static const char* apzGnu_TypesPatch[] = {
-    "gnu_type",
+static const char* apzSvr4_Undeclared_GetrngePatch[] = {
+    "format",
+    "%0\n\
+static int getrnge ();",
+    "^static int[ \t]+size;",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Sysv68_String fix
  */
-#define SYSV68_STRING_FIXIDX             113
 tSCC zSysv68_StringName[] =
      "sysv68_string";
 
@@ -4564,7 +5356,6 @@ extern unsigned int\\\n\
  *
  *  Description of Sysz_Stdlib_For_Sun fix
  */
-#define SYSZ_STDLIB_FOR_SUN_FIXIDX       114
 tSCC zSysz_Stdlib_For_SunName[] =
      "sysz_stdlib_for_sun";
 
@@ -4596,11 +5387,45 @@ static const char* apzSysz_Stdlib_For_SunPatch[] = {
     "void *\t%1(",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Thread_Keyword fix
+ */
+tSCC zThread_KeywordName[] =
+     "thread_keyword";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zThread_KeywordList[] =
+  "|pthread.h|bits/sigthread.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzThread_KeywordMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zThread_KeywordSelect0[] =
+       "([* ])__thread([,)])";
+
+#define    THREAD_KEYWORD_TEST_CT  1
+static tTestDesc aThread_KeywordTests[] = {
+  { TT_EGREP,    zThread_KeywordSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Thread_Keyword
+ */
+static const char* apzThread_KeywordPatch[] = {
+    "format",
+    "%1__thr%2",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Tinfo_Cplusplus fix
  */
-#define TINFO_CPLUSPLUS_FIXIDX           115
 tSCC zTinfo_CplusplusName[] =
      "tinfo_cplusplus";
 
@@ -4632,11 +5457,45 @@ static const char* apzTinfo_CplusplusPatch[] = {
     " __cplusplus",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Ultrix_Atexit_Param fix
+ */
+tSCC zUltrix_Atexit_ParamName[] =
+     "ultrix_atexit_param";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zUltrix_Atexit_ParamList[] =
+  "|stdlib.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzUltrix_Atexit_ParamMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zUltrix_Atexit_ParamSelect0[] =
+       "atexit\\(.*\\(\\)";
+
+#define    ULTRIX_ATEXIT_PARAM_TEST_CT  1
+static tTestDesc aUltrix_Atexit_ParamTests[] = {
+  { TT_EGREP,    zUltrix_Atexit_ParamSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Ultrix_Atexit_Param
+ */
+static const char* apzUltrix_Atexit_ParamPatch[] = {
+    "format",
+    "atexit( void (*__func)( void )",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Ultrix_Atof_Param fix
  */
-#define ULTRIX_ATOF_PARAM_FIXIDX         116
 tSCC zUltrix_Atof_ParamName[] =
      "ultrix_atof_param";
 
@@ -4672,7 +5531,6 @@ static const char* apzUltrix_Atof_ParamPatch[] = {
  *
  *  Description of Ultrix_Const fix
  */
-#define ULTRIX_CONST_FIXIDX              117
 tSCC zUltrix_ConstName[] =
      "ultrix_const";
 
@@ -4709,7 +5567,6 @@ static const char* apzUltrix_ConstPatch[] = {
  *
  *  Description of Ultrix_Const2 fix
  */
-#define ULTRIX_CONST2_FIXIDX             118
 tSCC zUltrix_Const2Name[] =
      "ultrix_const2";
 
@@ -4746,7 +5603,6 @@ static const char* apzUltrix_Const2Patch[] = {
  *
  *  Description of Ultrix_Fix_Fixproto fix
  */
-#define ULTRIX_FIX_FIXPROTO_FIXIDX       119
 tSCC zUltrix_Fix_FixprotoName[] =
      "ultrix_fix_fixproto";
 
@@ -4784,7 +5640,6 @@ static const char* apzUltrix_Fix_FixprotoPatch[] = {
  *
  *  Description of Ultrix_Ifdef fix
  */
-#define ULTRIX_IFDEF_FIXIDX              120
 tSCC zUltrix_IfdefName[] =
      "ultrix_ifdef";
 
@@ -4820,7 +5675,6 @@ static const char* apzUltrix_IfdefPatch[] = {
  *
  *  Description of Ultrix_Math_Ifdef fix
  */
-#define ULTRIX_MATH_IFDEF_FIXIDX         121
 tSCC zUltrix_Math_IfdefName[] =
      "ultrix_math_ifdef";
 
@@ -4856,7 +5710,6 @@ static const char* apzUltrix_Math_IfdefPatch[] = {
  *
  *  Description of Ultrix_Nested_Ioctl fix
  */
-#define ULTRIX_NESTED_IOCTL_FIXIDX       122
 tSCC zUltrix_Nested_IoctlName[] =
      "ultrix_nested_ioctl";
 
@@ -4891,7 +5744,6 @@ static const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
  *
  *  Description of Ultrix_Nested_Svc fix
  */
-#define ULTRIX_NESTED_SVC_FIXIDX         123
 tSCC zUltrix_Nested_SvcName[] =
      "ultrix_nested_svc";
 
@@ -4926,7 +5778,6 @@ static const char* apzUltrix_Nested_SvcPatch[] = { "sed",
  *
  *  Description of Ultrix_Stat fix
  */
-#define ULTRIX_STAT_FIXIDX               124
 tSCC zUltrix_StatName[] =
      "ultrix_stat";
 
@@ -4966,7 +5817,6 @@ static const char* apzUltrix_StatPatch[] = { "sed",
  *
  *  Description of Ultrix_Static fix
  */
-#define ULTRIX_STATIC_FIXIDX             125
 tSCC zUltrix_StaticName[] =
      "ultrix_static";
 
@@ -5003,7 +5853,6 @@ static const char* apzUltrix_StaticPatch[] = { "sed",
  *
  *  Description of Ultrix_Strings fix
  */
-#define ULTRIX_STRINGS_FIXIDX            126
 tSCC zUltrix_StringsName[] =
      "ultrix_strings";
 
@@ -5038,7 +5887,6 @@ static const char* apzUltrix_StringsPatch[] = {
  *
  *  Description of Undefine_Null fix
  */
-#define UNDEFINE_NULL_FIXIDX             127
 tSCC zUndefine_NullName[] =
      "undefine_null";
 
@@ -5073,18 +5921,54 @@ static tTestDesc aUndefine_NullTests[] = {
  */
 static const char* apzUndefine_NullPatch[] = {
     "format",
-    "#ifndef NULL%2\n\
-#define NULL%1%2\n\
-#endif%2\n",
-    "^#[ \t]*define[ \t]*[ \t]NULL([^\r\n\
-]+)([\r]*)\n",
+    "#ifndef NULL\n\
+#define NULL%1\n\
+#endif\n",
+    "^#[ \t]*define[ \t]+NULL([^\r\n\
+]+)[\r]*\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Unicosmk_Restrict fix
+ */
+tSCC zUnicosmk_RestrictName[] =
+     "unicosmk_restrict";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zUnicosmk_RestrictList[] =
+  "|stdio.h|stdlib.h|wchar.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzUnicosmk_RestrictMachs[] = {
+        "*-*-unicosmk*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zUnicosmk_RestrictSelect0[] =
+       "(\\*[ \t]*)restrict([ \t]+)";
+
+#define    UNICOSMK_RESTRICT_TEST_CT  1
+static tTestDesc aUnicosmk_RestrictTests[] = {
+  { TT_EGREP,    zUnicosmk_RestrictSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Unicosmk_Restrict
+ */
+static const char* apzUnicosmk_RestrictPatch[] = {
+    "format",
+    "%1__restrict__%2",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Uw7_Byteorder_Fix fix
  */
-#define UW7_BYTEORDER_FIX_FIXIDX         128
 tSCC zUw7_Byteorder_FixName[] =
      "uw7_byteorder_fix";
 
@@ -5115,7 +5999,7 @@ tSCC zUw7_Byteorder_FixSelect0[] =
  *  perform the 'test' shell command - do fix on success
  */
 tSCC zUw7_Byteorder_FixTest0[] =
-       "-f $DESTDIR/sys/byteorder.h";
+       "-f sys/byteorder.h";
 
 #define    UW7_BYTEORDER_FIX_TEST_CT  2
 static tTestDesc aUw7_Byteorder_FixTests[] = {
@@ -5128,14 +6012,13 @@ static tTestDesc aUw7_Byteorder_FixTests[] = {
 static const char* apzUw7_Byteorder_FixPatch[] = {
     "format",
     "",
-    "^extern.*(htons|ntohs).*\\(in_port_t\\).*\n",
+    "^extern.*[ \t](htons|ntohs).*\\(in_port_t\\).*;",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Va_I960_Macro fix
  */
-#define VA_I960_MACRO_FIXIDX             129
 tSCC zVa_I960_MacroName[] =
      "va_i960_macro";
 
@@ -5171,7 +6054,6 @@ static const char* apzVa_I960_MacroPatch[] = {
  *
  *  Description of Void_Null fix
  */
-#define VOID_NULL_FIXIDX                 130
 tSCC zVoid_NullName[] =
      "void_null";
 
@@ -5207,7 +6089,6 @@ static const char* apzVoid_NullPatch[] = {
  *
  *  Description of Vxworks_Gcc_Problem fix
  */
-#define VXWORKS_GCC_PROBLEM_FIXIDX       131
 tSCC zVxworks_Gcc_ProblemName[] =
      "vxworks_gcc_problem";
 
@@ -5257,7 +6138,6 @@ static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
  *
  *  Description of Vxworks_Needs_Vxtypes fix
  */
-#define VXWORKS_NEEDS_VXTYPES_FIXIDX     132
 tSCC zVxworks_Needs_VxtypesName[] =
      "vxworks_needs_vxtypes";
 
@@ -5293,7 +6173,6 @@ static const char* apzVxworks_Needs_VxtypesPatch[] = {
  *
  *  Description of Vxworks_Needs_Vxworks fix
  */
-#define VXWORKS_NEEDS_VXWORKS_FIXIDX     133
 tSCC zVxworks_Needs_VxworksName[] =
      "vxworks_needs_vxworks";
 
@@ -5342,7 +6221,6 @@ static const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
  *
  *  Description of Vxworks_Time fix
  */
-#define VXWORKS_TIME_FIXIDX              134
 tSCC zVxworks_TimeName[] =
      "vxworks_time";
 
@@ -5389,11 +6267,101 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\
 #define VOIDFUNCPTR __gcc_VOIDFUNCPTR",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Windiss_Math1 fix
+ */
+tSCC zWindiss_Math1Name[] =
+     "windiss_math1";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zWindiss_Math1List[] =
+  "|math.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzWindiss_Math1Machs[] = {
+        "*-*-windiss",
+        (const char*)NULL };
+#define WINDISS_MATH1_TEST_CT  0
+#define aWindiss_Math1Tests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Windiss_Math1
+ */
+static const char* apzWindiss_Math1Patch[] = { "sed",
+    "-e", "s|inline long double cosl.*|#ifndef __GNUC__|",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Windiss_Math2 fix
+ */
+tSCC zWindiss_Math2Name[] =
+     "windiss_math2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zWindiss_Math2List[] =
+  "|math.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzWindiss_Math2Machs[] = {
+        "*-*-windiss",
+        (const char*)NULL };
+#define WINDISS_MATH2_TEST_CT  0
+#define aWindiss_Math2Tests   (tTestDesc*)NULL
+
+/*
+ *  Fix Command Arguments for Windiss_Math2
+ */
+static const char* apzWindiss_Math2Patch[] = { "sed",
+    "-e", "s|/\\* long double declarations \\*/|#endif /* __GNUC__ */|",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Windiss_Valist fix
+ */
+tSCC zWindiss_ValistName[] =
+     "windiss_valist";
+
+/*
+ *  File name selection pattern
+ */
+#define zWindiss_ValistList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzWindiss_ValistMachs[] = {
+        "*-*-windiss",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zWindiss_ValistSelect0[] =
+       "(#include.*)diab/va_list.h";
+
+#define    WINDISS_VALIST_TEST_CT  1
+static tTestDesc aWindiss_ValistTests[] = {
+  { TT_EGREP,    zWindiss_ValistSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Windiss_Valist
+ */
+static const char* apzWindiss_ValistPatch[] = { "sed",
+    "-e", "s|diab/va_list.h|stdarg.h|",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of X11_Class fix
  */
-#define X11_CLASS_FIXIDX                 135
 tSCC zX11_ClassName[] =
      "x11_class";
 
@@ -5440,7 +6408,6 @@ static const char* apzX11_ClassPatch[] = {
  *
  *  Description of X11_Class_Usage fix
  */
-#define X11_CLASS_USAGE_FIXIDX           136
 tSCC zX11_Class_UsageName[] =
      "x11_class_usage";
 
@@ -5483,7 +6450,6 @@ static const char* apzX11_Class_UsagePatch[] = {
  *
  *  Description of X11_New fix
  */
-#define X11_NEW_FIXIDX                   137
 tSCC zX11_NewName[] =
      "x11_new";
 
@@ -5524,7 +6490,6 @@ static const char* apzX11_NewPatch[] = { "sed",
  *
  *  Description of X11_Sprintf fix
  */
-#define X11_SPRINTF_FIXIDX               138
 tSCC zX11_SprintfName[] =
      "x11_sprintf";
 
@@ -5563,51 +6528,182 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          146
-#define MACH_LIST_SIZE_LIMIT 279
-#define FIX_COUNT            139
+#define REGEX_COUNT          185
+#define MACH_LIST_SIZE_LIMIT 261
+#define FIX_COUNT            165
+
+/*
+ *  Enumerate the fixes
+ */
+typedef enum {
+    AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX,
+    AAB_FD_ZERO_GNU_TYPES_H_FIXIDX,
+    AAB_FD_ZERO_SELECTBITS_H_FIXIDX,
+    AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
+    AAB_SUN_MEMCPY_FIXIDX,
+    AAB_ULTRIX_ANSI_COMPAT_FIXIDX,
+    AAB_ULTRIX_LIMITS_FIXIDX,
+    AAB_ULTRIX_MEMORY_FIXIDX,
+    AAB_ULTRIX_STRING_FIXIDX,
+    AIX_PTHREAD_FIXIDX,
+    AIX_SYSMACHINE_FIXIDX,
+    AIX_SYSWAIT_FIXIDX,
+    AIX_VOLATILE_FIXIDX,
+    ALPHA___ASSERT_FIXIDX,
+    ALPHA___EXTERN_PREFIX_FIXIDX,
+    ALPHA___EXTERN_PREFIX_STANDARDS_FIXIDX,
+    ALPHA___EXTERN_PREFIX_SYS_STAT_FIXIDX,
+    ALPHA_ASSERT_FIXIDX,
+    ALPHA_GETOPT_FIXIDX,
+    ALPHA_PARENS_FIXIDX,
+    ALPHA_PTHREAD_FIXIDX,
+    ALPHA_PTHREAD_GCC_FIXIDX,
+    ALPHA_SBRK_FIXIDX,
+    ALPHA_WCHAR_FIXIDX,
+    AVOID_BOOL_DEFINE_FIXIDX,
+    AVOID_BOOL_TYPE_FIXIDX,
+    AVOID_WCHAR_T_TYPE_FIXIDX,
+    BAD_LVAL_FIXIDX,
+    BAD_STRUCT_TERM_FIXIDX,
+    BADQUOTE_FIXIDX,
+    BROKEN_ASSERT_STDIO_FIXIDX,
+    BROKEN_ASSERT_STDLIB_FIXIDX,
+    BROKEN_CABS_FIXIDX,
+    BSD_STDIO_ATTRS_CONFLICT_FIXIDX,
+    CTRL_QUOTES_DEF_FIXIDX,
+    CTRL_QUOTES_USE_FIXIDX,
+    CXX_UNREADY_FIXIDX,
+    DARWIN_PRIVATE_EXTERN_FIXIDX,
+    DEC_INTERN_ASM_FIXIDX,
+    DJGPP_WCHAR_H_FIXIDX,
+    ECD_CURSOR_FIXIDX,
+    FREEBSD_GCC3_BREAKAGE_FIXIDX,
+    GNU_TYPES_FIXIDX,
+    HP_INLINE_FIXIDX,
+    HP_SYSFILE_FIXIDX,
+    HPUX10_CPP_POW_INLINE_FIXIDX,
+    HPUX11_CPP_POW_INLINE_FIXIDX,
+    HPUX10_CTYPE_DECLARATIONS1_FIXIDX,
+    HPUX10_CTYPE_DECLARATIONS2_FIXIDX,
+    HPUX11_ABS_FIXIDX,
+    HPUX11_FABSF_FIXIDX,
+    HPUX11_SIZE_T_FIXIDX,
+    HPUX11_SNPRINTF_FIXIDX,
+    HPUX11_UINT32_C_FIXIDX,
+    HPUX11_VSNPRINTF_FIXIDX,
+    HPUX8_BOGUS_INLINES_FIXIDX,
+    HPUX_CTYPE_MACROS_FIXIDX,
+    HPUX_LONG_DOUBLE_FIXIDX,
+    HPUX_MAXINT_FIXIDX,
+    HPUX_SYSTIME_FIXIDX,
+    INT_ABORT_FREE_AND_EXIT_FIXIDX,
+    IO_QUOTES_DEF_FIXIDX,
+    IO_QUOTES_USE_FIXIDX,
+    IP_MISSING_SEMI_FIXIDX,
+    IRIX___RESTRICT_FIXIDX,
+    IRIX_ASM_APOSTROPHE_FIXIDX,
+    IRIX_LIMITS_CONST_FIXIDX,
+    IRIX_SOCKLEN_T_FIXIDX,
+    IRIX_STDIO_VA_LIST_FIXIDX,
+    IRIX_WCSFTIME_FIXIDX,
+    ISC_FMOD_FIXIDX,
+    ISC_OMITS_WITH_STDC_FIXIDX,
+    KANDR_CONCAT_FIXIDX,
+    LIBC1_G_VA_LIST_FIXIDX,
+    LIBC1_IFDEFD_MEMX_FIXIDX,
+    LIMITS_IFNDEFS_FIXIDX,
+    LYNX_VOID_INT_FIXIDX,
+    LYNXOS_FCNTL_PROTO_FIXIDX,
+    MACHINE_ANSI_H_VA_LIST_FIXIDX,
+    MACHINE_NAME_FIXIDX,
+    MATH_EXCEPTION_FIXIDX,
+    MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX,
+    MATH_HUGE_VAL_IFNDEF_FIXIDX,
+    NESTED_AUTH_DES_FIXIDX,
+    NESTED_MOTOROLA_FIXIDX,
+    NESTED_SYS_LIMITS_FIXIDX,
+    NETBSD_EXTRA_SEMICOLON_FIXIDX,
+    NEXT_MATH_PREFIX_FIXIDX,
+    NEXT_TEMPLATE_FIXIDX,
+    NEXT_VOLITILE_FIXIDX,
+    NEXT_WAIT_UNION_FIXIDX,
+    NODEENT_SYNTAX_FIXIDX,
+    OBSTACK_LVALUE_CAST_FIXIDX,
+    OSF_NAMESPACE_A_FIXIDX,
+    OSF_NAMESPACE_C_FIXIDX,
+    PTHREAD_PAGE_SIZE_FIXIDX,
+    READ_RET_TYPE_FIXIDX,
+    RS6000_DOUBLE_FIXIDX,
+    RS6000_FCHMOD_FIXIDX,
+    RS6000_PARAM_FIXIDX,
+    SCO_MATH_FIXIDX,
+    SCO_REGSET_FIXIDX,
+    SCO_STATIC_FUNC_FIXIDX,
+    SCO_UTIME_FIXIDX,
+    SOLARIS_MUTEX_INIT_1_FIXIDX,
+    SOLARIS_MUTEX_INIT_2_FIXIDX,
+    SOLARIS_SOCKET_FIXIDX,
+    SOLARIS_STDIO_TAG_FIXIDX,
+    SOLARIS_UNISTD_FIXIDX,
+    SOLARIS_WIDEC_FIXIDX,
+    STATSSWTCH_FIXIDX,
+    STDIO_STDARG_H_FIXIDX,
+    STDIO_VA_LIST_FIXIDX,
+    STRICT_ANSI_NOT_FIXIDX,
+    STRICT_ANSI_NOT_CTD_FIXIDX,
+    STRICT_ANSI_ONLY_FIXIDX,
+    STRUCT_FILE_FIXIDX,
+    STRUCT_SOCKADDR_FIXIDX,
+    SUN_AUTH_PROTO_FIXIDX,
+    SUN_BOGUS_IFDEF_FIXIDX,
+    SUN_CATMACRO_FIXIDX,
+    SUN_MALLOC_FIXIDX,
+    SUN_RUSERS_SEMI_FIXIDX,
+    SUN_SIGNAL_FIXIDX,
+    SUNOS_MATHERR_DECL_FIXIDX,
+    SUNOS_STRLEN_FIXIDX,
+    SVR4__P_FIXIDX,
+    SVR4_DISABLE_OPT_FIXIDX,
+    SVR4_GETCWD_FIXIDX,
+    SVR4_KRNL_FIXIDX,
+    SVR4_PROFIL_FIXIDX,
+    SVR4_SIGHANDLER_TYPE_FIXIDX,
+    SVR4_UNDECLARED_GETRNGE_FIXIDX,
+    SYSV68_STRING_FIXIDX,
+    SYSZ_STDLIB_FOR_SUN_FIXIDX,
+    THREAD_KEYWORD_FIXIDX,
+    TINFO_CPLUSPLUS_FIXIDX,
+    ULTRIX_ATEXIT_PARAM_FIXIDX,
+    ULTRIX_ATOF_PARAM_FIXIDX,
+    ULTRIX_CONST_FIXIDX,
+    ULTRIX_CONST2_FIXIDX,
+    ULTRIX_FIX_FIXPROTO_FIXIDX,
+    ULTRIX_IFDEF_FIXIDX,
+    ULTRIX_MATH_IFDEF_FIXIDX,
+    ULTRIX_NESTED_IOCTL_FIXIDX,
+    ULTRIX_NESTED_SVC_FIXIDX,
+    ULTRIX_STAT_FIXIDX,
+    ULTRIX_STATIC_FIXIDX,
+    ULTRIX_STRINGS_FIXIDX,
+    UNDEFINE_NULL_FIXIDX,
+    UNICOSMK_RESTRICT_FIXIDX,
+    UW7_BYTEORDER_FIX_FIXIDX,
+    VA_I960_MACRO_FIXIDX,
+    VOID_NULL_FIXIDX,
+    VXWORKS_GCC_PROBLEM_FIXIDX,
+    VXWORKS_NEEDS_VXTYPES_FIXIDX,
+    VXWORKS_NEEDS_VXWORKS_FIXIDX,
+    VXWORKS_TIME_FIXIDX,
+    WINDISS_MATH1_FIXIDX,
+    WINDISS_MATH2_FIXIDX,
+    WINDISS_VALIST_FIXIDX,
+    X11_CLASS_FIXIDX,
+    X11_CLASS_USAGE_FIXIDX,
+    X11_NEW_FIXIDX,
+    X11_SPRINTF_FIXIDX
+} t_fixinc_idx;
 
 tFixDesc fixDescList[ FIX_COUNT ] = {
-  {  zAaa_Ki_IfaceName,    zAaa_Ki_IfaceList,
-     apzAaa_Ki_IfaceMachs,
-     AAA_KI_IFACE_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_Ki_IfaceTests,   apzAaa_Ki_IfacePatch, 0 },
-
-  {  zAaa_KiName,    zAaa_KiList,
-     apzAaa_KiMachs,
-     AAA_KI_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_KiTests,   apzAaa_KiPatch, 0 },
-
-  {  zAaa_Ki_CallsName,    zAaa_Ki_CallsList,
-     apzAaa_Ki_CallsMachs,
-     AAA_KI_CALLS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_Ki_CallsTests,   apzAaa_Ki_CallsPatch, 0 },
-
-  {  zAaa_Ki_DefsName,    zAaa_Ki_DefsList,
-     apzAaa_Ki_DefsMachs,
-     AAA_KI_DEFS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_Ki_DefsTests,   apzAaa_Ki_DefsPatch, 0 },
-
-  {  zAaa_StandardsName,    zAaa_StandardsList,
-     apzAaa_StandardsMachs,
-     AAA_STANDARDS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_StandardsTests,   apzAaa_StandardsPatch, 0 },
-
-  {  zAaa_Bad_FixesName,    zAaa_Bad_FixesList,
-     apzAaa_Bad_FixesMachs,
-     AAA_BAD_FIXES_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_Bad_FixesTests,   apzAaa_Bad_FixesPatch, 0 },
-
-  {  zAaa_TimeName,    zAaa_TimeList,
-     apzAaa_TimeMachs,
-     AAA_TIME_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAaa_TimeTests,   apzAaa_TimePatch, 0 },
-
-  {  zAab_Dgux_Int_VarargsName,    zAab_Dgux_Int_VarargsList,
-     apzAab_Dgux_Int_VarargsMachs,
-     AAB_DGUX_INT_VARARGS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Dgux_Int_VarargsTests,   apzAab_Dgux_Int_VarargsPatch, 0 },
-
   {  zAab_Fd_Zero_Asm_Posix_Types_HName,    zAab_Fd_Zero_Asm_Posix_Types_HList,
      apzAab_Fd_Zero_Asm_Posix_Types_HMachs,
      AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
@@ -5623,16 +6719,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AAB_FD_ZERO_SELECTBITS_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
      aAab_Fd_Zero_Selectbits_HTests,   apzAab_Fd_Zero_Selectbits_HPatch, 0 },
 
+  {  zAab_Solaris_Sys_Varargs_HName,    zAab_Solaris_Sys_Varargs_HList,
+     apzAab_Solaris_Sys_Varargs_HMachs,
+     AAB_SOLARIS_SYS_VARARGS_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
+     aAab_Solaris_Sys_Varargs_HTests,   apzAab_Solaris_Sys_Varargs_HPatch, 0 },
+
   {  zAab_Sun_MemcpyName,    zAab_Sun_MemcpyList,
      apzAab_Sun_MemcpyMachs,
      AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
      aAab_Sun_MemcpyTests,   apzAab_Sun_MemcpyPatch, 0 },
 
-  {  zAab_Svr4_Replace_ByteorderName,    zAab_Svr4_Replace_ByteorderList,
-     apzAab_Svr4_Replace_ByteorderMachs,
-     AAB_SVR4_REPLACE_BYTEORDER_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-     aAab_Svr4_Replace_ByteorderTests,   apzAab_Svr4_Replace_ByteorderPatch, 0 },
-
   {  zAab_Ultrix_Ansi_CompatName,    zAab_Ultrix_Ansi_CompatList,
      apzAab_Ultrix_Ansi_CompatMachs,
      AAB_ULTRIX_ANSI_COMPAT_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
@@ -5678,6 +6774,26 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ALPHA___ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAlpha___AssertTests,   apzAlpha___AssertPatch, 0 },
 
+  {  zAlpha___Extern_PrefixName,    zAlpha___Extern_PrefixList,
+     apzAlpha___Extern_PrefixMachs,
+     ALPHA___EXTERN_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAlpha___Extern_PrefixTests,   apzAlpha___Extern_PrefixPatch, 0 },
+
+  {  zAlpha___Extern_Prefix_StandardsName,    zAlpha___Extern_Prefix_StandardsList,
+     apzAlpha___Extern_Prefix_StandardsMachs,
+     ALPHA___EXTERN_PREFIX_STANDARDS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAlpha___Extern_Prefix_StandardsTests,   apzAlpha___Extern_Prefix_StandardsPatch, 0 },
+
+  {  zAlpha___Extern_Prefix_Sys_StatName,    zAlpha___Extern_Prefix_Sys_StatList,
+     apzAlpha___Extern_Prefix_Sys_StatMachs,
+     ALPHA___EXTERN_PREFIX_SYS_STAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAlpha___Extern_Prefix_Sys_StatTests,   apzAlpha___Extern_Prefix_Sys_StatPatch, 0 },
+
+  {  zAlpha_AssertName,    zAlpha_AssertList,
+     apzAlpha_AssertMachs,
+     ALPHA_ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAlpha_AssertTests,   apzAlpha_AssertPatch, 0 },
+
   {  zAlpha_GetoptName,    zAlpha_GetoptList,
      apzAlpha_GetoptMachs,
      ALPHA_GETOPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -5688,25 +6804,25 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ALPHA_PARENS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAlpha_ParensTests,   apzAlpha_ParensPatch, 0 },
 
+  {  zAlpha_PthreadName,    zAlpha_PthreadList,
+     apzAlpha_PthreadMachs,
+     ALPHA_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAlpha_PthreadTests,   apzAlpha_PthreadPatch, 0 },
+
+  {  zAlpha_Pthread_GccName,    zAlpha_Pthread_GccList,
+     apzAlpha_Pthread_GccMachs,
+     ALPHA_PTHREAD_GCC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAlpha_Pthread_GccTests,   apzAlpha_Pthread_GccPatch, 0 },
+
   {  zAlpha_SbrkName,    zAlpha_SbrkList,
      apzAlpha_SbrkMachs,
      ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAlpha_SbrkTests,   apzAlpha_SbrkPatch, 0 },
 
-  {  zArm_Norcroft_HintName,    zArm_Norcroft_HintList,
-     apzArm_Norcroft_HintMachs,
-     ARM_NORCROFT_HINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aArm_Norcroft_HintTests,   apzArm_Norcroft_HintPatch, 0 },
-
-  {  zArm_WcharName,    zArm_WcharList,
-     apzArm_WcharMachs,
-     ARM_WCHAR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aArm_WcharTests,   apzArm_WcharPatch, 0 },
-
-  {  zAux_AsmName,    zAux_AsmList,
-     apzAux_AsmMachs,
-     AUX_ASM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aAux_AsmTests,   apzAux_AsmPatch, 0 },
+  {  zAlpha_WcharName,    zAlpha_WcharList,
+     apzAlpha_WcharMachs,
+     ALPHA_WCHAR_TEST_CT, FD_MACH_ONLY,
+     aAlpha_WcharTests,   apzAlpha_WcharPatch, 0 },
 
   {  zAvoid_Bool_DefineName,    zAvoid_Bool_DefineList,
      apzAvoid_Bool_DefineMachs,
@@ -5753,6 +6869,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      BROKEN_CABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aBroken_CabsTests,   apzBroken_CabsPatch, 0 },
 
+  {  zBsd_Stdio_Attrs_ConflictName,    zBsd_Stdio_Attrs_ConflictList,
+     apzBsd_Stdio_Attrs_ConflictMachs,
+     BSD_STDIO_ATTRS_CONFLICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aBsd_Stdio_Attrs_ConflictTests,   apzBsd_Stdio_Attrs_ConflictPatch, 0 },
+
   {  zCtrl_Quotes_DefName,    zCtrl_Quotes_DefList,
      apzCtrl_Quotes_DefMachs,
      CTRL_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -5768,6 +6889,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aCxx_UnreadyTests,   apzCxx_UnreadyPatch, 0 },
 
+  {  zDarwin_Private_ExternName,    zDarwin_Private_ExternList,
+     apzDarwin_Private_ExternMachs,
+     DARWIN_PRIVATE_EXTERN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Private_ExternTests,   apzDarwin_Private_ExternPatch, 0 },
+
   {  zDec_Intern_AsmName,    zDec_Intern_AsmList,
      apzDec_Intern_AsmMachs,
      DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
@@ -5783,16 +6909,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ECD_CURSOR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aEcd_CursorTests,   apzEcd_CursorPatch, 0 },
 
-  {  zFix_Header_BreakageName,    zFix_Header_BreakageList,
-     apzFix_Header_BreakageMachs,
-     FIX_HEADER_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aFix_Header_BreakageTests,   apzFix_Header_BreakagePatch, 0 },
-
   {  zFreebsd_Gcc3_BreakageName,    zFreebsd_Gcc3_BreakageList,
      apzFreebsd_Gcc3_BreakageMachs,
      FREEBSD_GCC3_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aFreebsd_Gcc3_BreakageTests,   apzFreebsd_Gcc3_BreakagePatch, 0 },
 
+  {  zGnu_TypesName,    zGnu_TypesList,
+     apzGnu_TypesMachs,
+     GNU_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aGnu_TypesTests,   apzGnu_TypesPatch, 0 },
+
   {  zHp_InlineName,    zHp_InlineList,
      apzHp_InlineMachs,
      HP_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -5803,31 +6929,86 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HP_SYSFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHp_SysfileTests,   apzHp_SysfilePatch, 0 },
 
+  {  zHpux10_Cpp_Pow_InlineName,    zHpux10_Cpp_Pow_InlineList,
+     apzHpux10_Cpp_Pow_InlineMachs,
+     HPUX10_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux10_Cpp_Pow_InlineTests,   apzHpux10_Cpp_Pow_InlinePatch, 0 },
+
+  {  zHpux11_Cpp_Pow_InlineName,    zHpux11_Cpp_Pow_InlineList,
+     apzHpux11_Cpp_Pow_InlineMachs,
+     HPUX11_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_Cpp_Pow_InlineTests,   apzHpux11_Cpp_Pow_InlinePatch, 0 },
+
+  {  zHpux10_Ctype_Declarations1Name,    zHpux10_Ctype_Declarations1List,
+     apzHpux10_Ctype_Declarations1Machs,
+     HPUX10_CTYPE_DECLARATIONS1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux10_Ctype_Declarations1Tests,   apzHpux10_Ctype_Declarations1Patch, 0 },
+
+  {  zHpux10_Ctype_Declarations2Name,    zHpux10_Ctype_Declarations2List,
+     apzHpux10_Ctype_Declarations2Machs,
+     HPUX10_CTYPE_DECLARATIONS2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux10_Ctype_Declarations2Tests,   apzHpux10_Ctype_Declarations2Patch, 0 },
+
+  {  zHpux11_AbsName,    zHpux11_AbsList,
+     apzHpux11_AbsMachs,
+     HPUX11_ABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_AbsTests,   apzHpux11_AbsPatch, 0 },
+
   {  zHpux11_FabsfName,    zHpux11_FabsfList,
      apzHpux11_FabsfMachs,
      HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_FabsfTests,   apzHpux11_FabsfPatch, 0 },
 
+  {  zHpux11_Size_TName,    zHpux11_Size_TList,
+     apzHpux11_Size_TMachs,
+     HPUX11_SIZE_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_Size_TTests,   apzHpux11_Size_TPatch, 0 },
+
+  {  zHpux11_SnprintfName,    zHpux11_SnprintfList,
+     apzHpux11_SnprintfMachs,
+     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,
+     aHpux11_VsnprintfTests,   apzHpux11_VsnprintfPatch, 0 },
+
   {  zHpux8_Bogus_InlinesName,    zHpux8_Bogus_InlinesList,
      apzHpux8_Bogus_InlinesMachs,
      HPUX8_BOGUS_INLINES_TEST_CT, FD_MACH_ONLY,
      aHpux8_Bogus_InlinesTests,   apzHpux8_Bogus_InlinesPatch, 0 },
 
+  {  zHpux_Ctype_MacrosName,    zHpux_Ctype_MacrosList,
+     apzHpux_Ctype_MacrosMachs,
+     HPUX_CTYPE_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Ctype_MacrosTests,   apzHpux_Ctype_MacrosPatch, 0 },
+
+  {  zHpux_Long_DoubleName,    zHpux_Long_DoubleList,
+     apzHpux_Long_DoubleMachs,
+     HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY,
+     aHpux_Long_DoubleTests,   apzHpux_Long_DoublePatch, 0 },
+
+  {  zHpux_MaxintName,    zHpux_MaxintList,
+     apzHpux_MaxintMachs,
+     HPUX_MAXINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_MaxintTests,   apzHpux_MaxintPatch, 0 },
+
+  {  zHpux_SystimeName,    zHpux_SystimeList,
+     apzHpux_SystimeMachs,
+     HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_SystimeTests,   apzHpux_SystimePatch, 0 },
+
   {  zInt_Abort_Free_And_ExitName,    zInt_Abort_Free_And_ExitList,
      apzInt_Abort_Free_And_ExitMachs,
      INT_ABORT_FREE_AND_EXIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aInt_Abort_Free_And_ExitTests,   apzInt_Abort_Free_And_ExitPatch, 0 },
 
-  {  zIsc_Omits_With_StdcName,    zIsc_Omits_With_StdcList,
-     apzIsc_Omits_With_StdcMachs,
-     ISC_OMITS_WITH_STDC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIsc_Omits_With_StdcTests,   apzIsc_Omits_With_StdcPatch, 0 },
-
   {  zIo_Quotes_DefName,    zIo_Quotes_DefList,
      apzIo_Quotes_DefMachs,
      IO_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -5838,46 +7019,61 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      IO_QUOTES_USE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIo_Quotes_UseTests,   apzIo_Quotes_UsePatch, 0 },
 
-  {  zHpux_MaxintName,    zHpux_MaxintList,
-     apzHpux_MaxintMachs,
-     HPUX_MAXINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_MaxintTests,   apzHpux_MaxintPatch, 0 },
-
-  {  zHpux_SystimeName,    zHpux_SystimeList,
-     apzHpux_SystimeMachs,
-     HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_SystimeTests,   apzHpux_SystimePatch, 0 },
-
   {  zIp_Missing_SemiName,    zIp_Missing_SemiList,
      apzIp_Missing_SemiMachs,
      IP_MISSING_SEMI_TEST_CT, FD_MACH_ONLY,
      aIp_Missing_SemiTests,   apzIp_Missing_SemiPatch, 0 },
 
+  {  zIrix___RestrictName,    zIrix___RestrictList,
+     apzIrix___RestrictMachs,
+     IRIX___RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aIrix___RestrictTests,   apzIrix___RestrictPatch, 0 },
+
   {  zIrix_Asm_ApostropheName,    zIrix_Asm_ApostropheList,
      apzIrix_Asm_ApostropheMachs,
      IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIrix_Asm_ApostropheTests,   apzIrix_Asm_ApostrophePatch, 0 },
 
+  {  zIrix_Limits_ConstName,    zIrix_Limits_ConstList,
+     apzIrix_Limits_ConstMachs,
+     IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aIrix_Limits_ConstTests,   apzIrix_Limits_ConstPatch, 0 },
+
+  {  zIrix_Socklen_TName,    zIrix_Socklen_TList,
+     apzIrix_Socklen_TMachs,
+     IRIX_SOCKLEN_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aIrix_Socklen_TTests,   apzIrix_Socklen_TPatch, 0 },
+
   {  zIrix_Stdio_Va_ListName,    zIrix_Stdio_Va_ListList,
      apzIrix_Stdio_Va_ListMachs,
      IRIX_STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIrix_Stdio_Va_ListTests,   apzIrix_Stdio_Va_ListPatch, 0 },
 
-  {  zIrix_Limits_ConstName,    zIrix_Limits_ConstList,
-     apzIrix_Limits_ConstMachs,
-     IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aIrix_Limits_ConstTests,   apzIrix_Limits_ConstPatch, 0 },
+  {  zIrix_WcsftimeName,    zIrix_WcsftimeList,
+     apzIrix_WcsftimeMachs,
+     IRIX_WCSFTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aIrix_WcsftimeTests,   apzIrix_WcsftimePatch, 0 },
 
   {  zIsc_FmodName,    zIsc_FmodList,
      apzIsc_FmodMachs,
      ISC_FMOD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIsc_FmodTests,   apzIsc_FmodPatch, 0 },
 
+  {  zIsc_Omits_With_StdcName,    zIsc_Omits_With_StdcList,
+     apzIsc_Omits_With_StdcMachs,
+     ISC_OMITS_WITH_STDC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aIsc_Omits_With_StdcTests,   apzIsc_Omits_With_StdcPatch, 0 },
+
   {  zKandr_ConcatName,    zKandr_ConcatList,
      apzKandr_ConcatMachs,
      KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aKandr_ConcatTests,   apzKandr_ConcatPatch, 0 },
 
+  {  zLibc1_G_Va_ListName,    zLibc1_G_Va_ListList,
+     apzLibc1_G_Va_ListMachs,
+     LIBC1_G_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aLibc1_G_Va_ListTests,   apzLibc1_G_Va_ListPatch, 0 },
+
   {  zLibc1_Ifdefd_MemxName,    zLibc1_Ifdefd_MemxList,
      apzLibc1_Ifdefd_MemxMachs,
      LIBC1_IFDEFD_MEMX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -5898,21 +7094,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      LYNXOS_FCNTL_PROTO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aLynxos_Fcntl_ProtoTests,   apzLynxos_Fcntl_ProtoPatch, 0 },
 
-  {  zM88k_Bad_Hypot_OptName,    zM88k_Bad_Hypot_OptList,
-     apzM88k_Bad_Hypot_OptMachs,
-     M88K_BAD_HYPOT_OPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aM88k_Bad_Hypot_OptTests,   apzM88k_Bad_Hypot_OptPatch, 0 },
-
-  {  zM88k_Bad_S_IfName,    zM88k_Bad_S_IfList,
-     apzM88k_Bad_S_IfMachs,
-     M88K_BAD_S_IF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aM88k_Bad_S_IfTests,   apzM88k_Bad_S_IfPatch, 0 },
-
-  {  zM88k_Multi_InclName,    zM88k_Multi_InclList,
-     apzM88k_Multi_InclMachs,
-     M88K_MULTI_INCL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aM88k_Multi_InclTests,   apzM88k_Multi_InclPatch, 0 },
-
   {  zMachine_Ansi_H_Va_ListName,    zMachine_Ansi_H_Va_ListList,
      apzMachine_Ansi_H_Va_ListMachs,
      MACHINE_ANSI_H_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -5938,6 +7119,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      MATH_HUGE_VAL_IFNDEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aMath_Huge_Val_IfndefTests,   apzMath_Huge_Val_IfndefPatch, 0 },
 
+  {  zNested_Auth_DesName,    zNested_Auth_DesList,
+     apzNested_Auth_DesMachs,
+     NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aNested_Auth_DesTests,   apzNested_Auth_DesPatch, 0 },
+
   {  zNested_MotorolaName,    zNested_MotorolaList,
      apzNested_MotorolaMachs,
      NESTED_MOTOROLA_TEST_CT, FD_MACH_ONLY,
@@ -5948,15 +7134,10 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      NESTED_SYS_LIMITS_TEST_CT, FD_MACH_ONLY,
      aNested_Sys_LimitsTests,   apzNested_Sys_LimitsPatch, 0 },
 
-  {  zNested_Auth_DesName,    zNested_Auth_DesList,
-     apzNested_Auth_DesMachs,
-     NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aNested_Auth_DesTests,   apzNested_Auth_DesPatch, 0 },
-
-  {  zNews_Os_RecursionName,    zNews_Os_RecursionList,
-     apzNews_Os_RecursionMachs,
-     NEWS_OS_RECURSION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aNews_Os_RecursionTests,   apzNews_Os_RecursionPatch, 0 },
+  {  zNetbsd_Extra_SemicolonName,    zNetbsd_Extra_SemicolonList,
+     apzNetbsd_Extra_SemicolonMachs,
+     NETBSD_EXTRA_SEMICOLON_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aNetbsd_Extra_SemicolonTests,   apzNetbsd_Extra_SemicolonPatch, 0 },
 
   {  zNext_Math_PrefixName,    zNext_Math_PrefixList,
      apzNext_Math_PrefixMachs,
@@ -5983,6 +7164,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      NODEENT_SYNTAX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aNodeent_SyntaxTests,   apzNodeent_SyntaxPatch, 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 },
+
   {  zOsf_Namespace_AName,    zOsf_Namespace_AList,
      apzOsf_Namespace_AMachs,
      OSF_NAMESPACE_A_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -6018,35 +7204,55 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      RS6000_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aRs6000_ParamTests,   apzRs6000_ParamPatch, 0 },
 
+  {  zSco_MathName,    zSco_MathList,
+     apzSco_MathMachs,
+     SCO_MATH_TEST_CT, FD_MACH_ONLY,
+     aSco_MathTests,   apzSco_MathPatch, 0 },
+
+  {  zSco_RegsetName,    zSco_RegsetList,
+     apzSco_RegsetMachs,
+     SCO_REGSET_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSco_RegsetTests,   apzSco_RegsetPatch, 0 },
+
   {  zSco_Static_FuncName,    zSco_Static_FuncList,
      apzSco_Static_FuncMachs,
      SCO_STATIC_FUNC_TEST_CT, FD_MACH_ONLY,
      aSco_Static_FuncTests,   apzSco_Static_FuncPatch, 0 },
 
-  {  zStrict_Ansi_NotName,    zStrict_Ansi_NotList,
-     apzStrict_Ansi_NotMachs,
-     STRICT_ANSI_NOT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aStrict_Ansi_NotTests,   apzStrict_Ansi_NotPatch, 0 },
-
-  {  zStrict_Ansi_Not_CtdName,    zStrict_Ansi_Not_CtdList,
-     apzStrict_Ansi_Not_CtdMachs,
-     STRICT_ANSI_NOT_CTD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aStrict_Ansi_Not_CtdTests,   apzStrict_Ansi_Not_CtdPatch, 0 },
-
-  {  zStrict_Ansi_OnlyName,    zStrict_Ansi_OnlyList,
-     apzStrict_Ansi_OnlyMachs,
-     STRICT_ANSI_ONLY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aStrict_Ansi_OnlyTests,   apzStrict_Ansi_OnlyPatch, 0 },
-
   {  zSco_UtimeName,    zSco_UtimeList,
      apzSco_UtimeMachs,
      SCO_UTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSco_UtimeTests,   apzSco_UtimePatch, 0 },
 
-  {  zSolaris27_Mutex_InitName,    zSolaris27_Mutex_InitList,
-     apzSolaris27_Mutex_InitMachs,
-     SOLARIS27_MUTEX_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aSolaris27_Mutex_InitTests,   apzSolaris27_Mutex_InitPatch, 0 },
+  {  zSolaris_Mutex_Init_1Name,    zSolaris_Mutex_Init_1List,
+     apzSolaris_Mutex_Init_1Machs,
+     SOLARIS_MUTEX_INIT_1_TEST_CT, FD_MACH_ONLY,
+     aSolaris_Mutex_Init_1Tests,   apzSolaris_Mutex_Init_1Patch, 0 },
+
+  {  zSolaris_Mutex_Init_2Name,    zSolaris_Mutex_Init_2List,
+     apzSolaris_Mutex_Init_2Machs,
+     SOLARIS_MUTEX_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Mutex_Init_2Tests,   apzSolaris_Mutex_Init_2Patch, 0 },
+
+  {  zSolaris_SocketName,    zSolaris_SocketList,
+     apzSolaris_SocketMachs,
+     SOLARIS_SOCKET_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_SocketTests,   apzSolaris_SocketPatch, 0 },
+
+  {  zSolaris_Stdio_TagName,    zSolaris_Stdio_TagList,
+     apzSolaris_Stdio_TagMachs,
+     SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,
+     aSolaris_Stdio_TagTests,   apzSolaris_Stdio_TagPatch, 0 },
+
+  {  zSolaris_UnistdName,    zSolaris_UnistdList,
+     apzSolaris_UnistdMachs,
+     SOLARIS_UNISTD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_UnistdTests,   apzSolaris_UnistdPatch, 0 },
+
+  {  zSolaris_WidecName,    zSolaris_WidecList,
+     apzSolaris_WidecMachs,
+     SOLARIS_WIDEC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_WidecTests,   apzSolaris_WidecPatch, 0 },
 
   {  zStatsswtchName,    zStatsswtchList,
      apzStatsswtchMachs,
@@ -6063,6 +7269,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY,
      aStdio_Va_ListTests,   apzStdio_Va_ListPatch, 0 },
 
+  {  zStrict_Ansi_NotName,    zStrict_Ansi_NotList,
+     apzStrict_Ansi_NotMachs,
+     STRICT_ANSI_NOT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aStrict_Ansi_NotTests,   apzStrict_Ansi_NotPatch, 0 },
+
+  {  zStrict_Ansi_Not_CtdName,    zStrict_Ansi_Not_CtdList,
+     apzStrict_Ansi_Not_CtdMachs,
+     STRICT_ANSI_NOT_CTD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aStrict_Ansi_Not_CtdTests,   apzStrict_Ansi_Not_CtdPatch, 0 },
+
+  {  zStrict_Ansi_OnlyName,    zStrict_Ansi_OnlyList,
+     apzStrict_Ansi_OnlyMachs,
+     STRICT_ANSI_ONLY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aStrict_Ansi_OnlyTests,   apzStrict_Ansi_OnlyPatch, 0 },
+
   {  zStruct_FileName,    zStruct_FileList,
      apzStruct_FileMachs,
      STRUCT_FILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -6118,20 +7339,35 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SVR4__P_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSvr4__PTests,   apzSvr4__PPatch, 0 },
 
+  {  zSvr4_Disable_OptName,    zSvr4_Disable_OptList,
+     apzSvr4_Disable_OptMachs,
+     SVR4_DISABLE_OPT_TEST_CT, FD_MACH_ONLY,
+     aSvr4_Disable_OptTests,   apzSvr4_Disable_OptPatch, 0 },
+
   {  zSvr4_GetcwdName,    zSvr4_GetcwdList,
      apzSvr4_GetcwdMachs,
      SVR4_GETCWD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSvr4_GetcwdTests,   apzSvr4_GetcwdPatch, 0 },
 
+  {  zSvr4_KrnlName,    zSvr4_KrnlList,
+     apzSvr4_KrnlMachs,
+     SVR4_KRNL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSvr4_KrnlTests,   apzSvr4_KrnlPatch, 0 },
+
   {  zSvr4_ProfilName,    zSvr4_ProfilList,
      apzSvr4_ProfilMachs,
      SVR4_PROFIL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSvr4_ProfilTests,   apzSvr4_ProfilPatch, 0 },
 
-  {  zGnu_TypesName,    zGnu_TypesList,
-     apzGnu_TypesMachs,
-     GNU_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aGnu_TypesTests,   apzGnu_TypesPatch, 0 },
+  {  zSvr4_Sighandler_TypeName,    zSvr4_Sighandler_TypeList,
+     apzSvr4_Sighandler_TypeMachs,
+     SVR4_SIGHANDLER_TYPE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSvr4_Sighandler_TypeTests,   apzSvr4_Sighandler_TypePatch, 0 },
+
+  {  zSvr4_Undeclared_GetrngeName,    zSvr4_Undeclared_GetrngeList,
+     apzSvr4_Undeclared_GetrngeMachs,
+     SVR4_UNDECLARED_GETRNGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSvr4_Undeclared_GetrngeTests,   apzSvr4_Undeclared_GetrngePatch, 0 },
 
   {  zSysv68_StringName,    zSysv68_StringList,
      apzSysv68_StringMachs,
@@ -6143,11 +7379,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SYSZ_STDLIB_FOR_SUN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aSysz_Stdlib_For_SunTests,   apzSysz_Stdlib_For_SunPatch, 0 },
 
+  {  zThread_KeywordName,    zThread_KeywordList,
+     apzThread_KeywordMachs,
+     THREAD_KEYWORD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aThread_KeywordTests,   apzThread_KeywordPatch, 0 },
+
   {  zTinfo_CplusplusName,    zTinfo_CplusplusList,
      apzTinfo_CplusplusMachs,
      TINFO_CPLUSPLUS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aTinfo_CplusplusTests,   apzTinfo_CplusplusPatch, 0 },
 
+  {  zUltrix_Atexit_ParamName,    zUltrix_Atexit_ParamList,
+     apzUltrix_Atexit_ParamMachs,
+     ULTRIX_ATEXIT_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aUltrix_Atexit_ParamTests,   apzUltrix_Atexit_ParamPatch, 0 },
+
   {  zUltrix_Atof_ParamName,    zUltrix_Atof_ParamList,
      apzUltrix_Atof_ParamMachs,
      ULTRIX_ATOF_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -6208,6 +7454,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      UNDEFINE_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aUndefine_NullTests,   apzUndefine_NullPatch, 0 },
 
+  {  zUnicosmk_RestrictName,    zUnicosmk_RestrictList,
+     apzUnicosmk_RestrictMachs,
+     UNICOSMK_RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aUnicosmk_RestrictTests,   apzUnicosmk_RestrictPatch, 0 },
+
   {  zUw7_Byteorder_FixName,    zUw7_Byteorder_FixList,
      apzUw7_Byteorder_FixMachs,
      UW7_BYTEORDER_FIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -6243,6 +7494,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      VXWORKS_TIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aVxworks_TimeTests,   apzVxworks_TimePatch, 0 },
 
+  {  zWindiss_Math1Name,    zWindiss_Math1List,
+     apzWindiss_Math1Machs,
+     WINDISS_MATH1_TEST_CT, FD_MACH_ONLY,
+     aWindiss_Math1Tests,   apzWindiss_Math1Patch, 0 },
+
+  {  zWindiss_Math2Name,    zWindiss_Math2List,
+     apzWindiss_Math2Machs,
+     WINDISS_MATH2_TEST_CT, FD_MACH_ONLY,
+     aWindiss_Math2Tests,   apzWindiss_Math2Patch, 0 },
+
+  {  zWindiss_ValistName,    zWindiss_ValistList,
+     apzWindiss_ValistMachs,
+     WINDISS_VALIST_TEST_CT, FD_MACH_ONLY,
+     aWindiss_ValistTests,   apzWindiss_ValistPatch, 0 },
+
   {  zX11_ClassName,    zX11_ClassList,
      apzX11_ClassMachs,
      X11_CLASS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,