From: korbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 8 Mar 2001 21:41:36 +0000 (+0000)
Subject: HTML typos and avoid standards.h breakage
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=1b3c35ec5020b2a89c61882896e66b99437cdc6c

HTML typos and avoid standards.h breakage


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40327 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 25128ec1284..b468fcc972b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+Thu Mar  8 21:09:10 2001  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* fixinc/inclhack.def (AAB_dgux_int_varargs): Don't use HTML
+	entities.
+	* fixinc/fixincl.x: Regenerate.
+
+Thu Mar  8 21:09:10 2001  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* fixinc/inclhack.def (AAA_standards): Undo <standards.h> breakage
+	on Tru64 UNIX.
+	* fixinc/fixincl.x: Regenerate.
+
 2001-03-08  Richard Henderson  <rth@redhat.com>
 
 	* configure.in (HAVE_AS_LEB128): New assembler check.
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 832f3ab4fa6..f86ed6ca98b 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -5,7 +5,7 @@
  * files which are fixed to work correctly with ANSI C and placed in a
  * directory that GNU C will search.
  *
- * This file contains 135 fixup descriptions.
+ * This file contains 136 fixup descriptions.
  *
  * See README for more information.
  *
@@ -168,9 +168,43 @@ static const char* apzAaa_Ki_DefsPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  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             4
+#define AAA_BAD_FIXES_FIXIDX             5
 tSCC zAaa_Bad_FixesName[] =
      "AAA_bad_fixes";
 
@@ -196,7 +230,7 @@ static const char* apzAaa_Bad_FixesPatch[] = {
  *
  *  Description of Aaa_Time fix
  */
-#define AAA_TIME_FIXIDX                  5
+#define AAA_TIME_FIXIDX                  6
 tSCC zAaa_TimeName[] =
      "AAA_time";
 
@@ -230,7 +264,7 @@ static const char* apzAaa_TimePatch[] = {
  *
  *  Description of Aab_Dgux_Int_Varargs fix
  */
-#define AAB_DGUX_INT_VARARGS_FIXIDX      6
+#define AAB_DGUX_INT_VARARGS_FIXIDX      7
 tSCC zAab_Dgux_Int_VarargsName[] =
      "AAB_dgux_int_varargs";
 
@@ -263,7 +297,7 @@ static const char* apzAab_Dgux_Int_VarargsPatch[] = {
 */\n\
 \n\
 #ifndef ___int_features_h\n\
-#include &lt;sys/_int_features.h&gt;\n\
+#include <sys/_int_features.h>\n\
 #endif\n\
 \n\
 #if !(defined(_VA_LIST) || defined(_VA_LIST_))\n\
@@ -318,7 +352,7 @@ typedef char * va_list;\n\
  *
  *  Description of Aab_Fd_Zero_Asm_Posix_Types_H fix
  */
-#define AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX 7
+#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";
 
@@ -374,7 +408,7 @@ static const char* apzAab_Fd_Zero_Asm_Posix_Types_HPatch[] = {
  *
  *  Description of Aab_Fd_Zero_Gnu_Types_H fix
  */
-#define AAB_FD_ZERO_GNU_TYPES_H_FIXIDX   8
+#define AAB_FD_ZERO_GNU_TYPES_H_FIXIDX   9
 tSCC zAab_Fd_Zero_Gnu_Types_HName[] =
      "AAB_fd_zero_gnu_types_h";
 
@@ -421,7 +455,7 @@ static const char* apzAab_Fd_Zero_Gnu_Types_HPatch[] = {
  *
  *  Description of Aab_Fd_Zero_Selectbits_H fix
  */
-#define AAB_FD_ZERO_SELECTBITS_H_FIXIDX  9
+#define AAB_FD_ZERO_SELECTBITS_H_FIXIDX  10
 tSCC zAab_Fd_Zero_Selectbits_HName[] =
      "AAB_fd_zero_selectbits_h";
 
@@ -472,7 +506,7 @@ static const char* apzAab_Fd_Zero_Selectbits_HPatch[] = {
  *
  *  Description of Aab_Sun_Memcpy fix
  */
-#define AAB_SUN_MEMCPY_FIXIDX            10
+#define AAB_SUN_MEMCPY_FIXIDX            11
 tSCC zAab_Sun_MemcpyName[] =
      "AAB_sun_memcpy";
 
@@ -525,7 +559,7 @@ extern int memcmp();\n\
  *
  *  Description of Aab_Svr4_Replace_Byteorder fix
  */
-#define AAB_SVR4_REPLACE_BYTEORDER_FIXIDX 11
+#define AAB_SVR4_REPLACE_BYTEORDER_FIXIDX 12
 tSCC zAab_Svr4_Replace_ByteorderName[] =
      "AAB_svr4_replace_byteorder";
 
@@ -701,7 +735,7 @@ ntohs (unsigned int __arg)\n\
  *
  *  Description of Aab_Ultrix_Ansi_Compat fix
  */
-#define AAB_ULTRIX_ANSI_COMPAT_FIXIDX    12
+#define AAB_ULTRIX_ANSI_COMPAT_FIXIDX    13
 tSCC zAab_Ultrix_Ansi_CompatName[] =
      "AAB_ultrix_ansi_compat";
 
@@ -736,7 +770,7 @@ static const char* apzAab_Ultrix_Ansi_CompatPatch[] = {
  *
  *  Description of Aab_Ultrix_Limits fix
  */
-#define AAB_ULTRIX_LIMITS_FIXIDX         13
+#define AAB_ULTRIX_LIMITS_FIXIDX         14
 tSCC zAab_Ultrix_LimitsName[] =
      "AAB_ultrix_limits";
 
@@ -770,7 +804,7 @@ static const char* apzAab_Ultrix_LimitsPatch[] = {
  *
  *  Description of Aab_Ultrix_Memory fix
  */
-#define AAB_ULTRIX_MEMORY_FIXIDX         14
+#define AAB_ULTRIX_MEMORY_FIXIDX         15
 tSCC zAab_Ultrix_MemoryName[] =
      "AAB_ultrix_memory";
 
@@ -804,7 +838,7 @@ static const char* apzAab_Ultrix_MemoryPatch[] = {
  *
  *  Description of Aab_Ultrix_String fix
  */
-#define AAB_ULTRIX_STRING_FIXIDX         15
+#define AAB_ULTRIX_STRING_FIXIDX         16
 tSCC zAab_Ultrix_StringName[] =
      "AAB_ultrix_string";
 
@@ -838,7 +872,7 @@ static const char* apzAab_Ultrix_StringPatch[] = {
  *
  *  Description of Aix_Pthread fix
  */
-#define AIX_PTHREAD_FIXIDX               16
+#define AIX_PTHREAD_FIXIDX               17
 tSCC zAix_PthreadName[] =
      "aix_pthread";
 
@@ -876,7 +910,7 @@ static const char* apzAix_PthreadPatch[] = {
  *
  *  Description of Aix_Sysmachine fix
  */
-#define AIX_SYSMACHINE_FIXIDX            17
+#define AIX_SYSMACHINE_FIXIDX            18
 tSCC zAix_SysmachineName[] =
      "aix_sysmachine";
 
@@ -912,7 +946,7 @@ static const char* apzAix_SysmachinePatch[] = {
  *
  *  Description of Aix_Syswait fix
  */
-#define AIX_SYSWAIT_FIXIDX               18
+#define AIX_SYSWAIT_FIXIDX               19
 tSCC zAix_SyswaitName[] =
      "aix_syswait";
 
@@ -952,7 +986,7 @@ static const char* apzAix_SyswaitPatch[] = {
  *
  *  Description of Aix_Volatile fix
  */
-#define AIX_VOLATILE_FIXIDX              19
+#define AIX_VOLATILE_FIXIDX              20
 tSCC zAix_VolatileName[] =
      "aix_volatile";
 
@@ -988,7 +1022,7 @@ static const char* apzAix_VolatilePatch[] = {
  *
  *  Description of Alpha_Getopt fix
  */
-#define ALPHA_GETOPT_FIXIDX              20
+#define ALPHA_GETOPT_FIXIDX              21
 tSCC zAlpha_GetoptName[] =
      "alpha_getopt";
 
@@ -1024,7 +1058,7 @@ static const char* apzAlpha_GetoptPatch[] = {
  *
  *  Description of Alpha_Parens fix
  */
-#define ALPHA_PARENS_FIXIDX              21
+#define ALPHA_PARENS_FIXIDX              22
 tSCC zAlpha_ParensName[] =
      "alpha_parens";
 
@@ -1060,7 +1094,7 @@ static const char* apzAlpha_ParensPatch[] = {
  *
  *  Description of Alpha_Sbrk fix
  */
-#define ALPHA_SBRK_FIXIDX                22
+#define ALPHA_SBRK_FIXIDX                23
 tSCC zAlpha_SbrkName[] =
      "alpha_sbrk";
 
@@ -1096,7 +1130,7 @@ static const char* apzAlpha_SbrkPatch[] = {
  *
  *  Description of Arm_Norcroft_Hint fix
  */
-#define ARM_NORCROFT_HINT_FIXIDX         23
+#define ARM_NORCROFT_HINT_FIXIDX         24
 tSCC zArm_Norcroft_HintName[] =
      "arm_norcroft_hint";
 
@@ -1132,7 +1166,7 @@ static const char* apzArm_Norcroft_HintPatch[] = {
  *
  *  Description of Arm_Wchar fix
  */
-#define ARM_WCHAR_FIXIDX                 24
+#define ARM_WCHAR_FIXIDX                 25
 tSCC zArm_WcharName[] =
      "arm_wchar";
 
@@ -1169,7 +1203,7 @@ static const char* apzArm_WcharPatch[] = {
  *
  *  Description of Aux_Asm fix
  */
-#define AUX_ASM_FIXIDX                   25
+#define AUX_ASM_FIXIDX                   26
 tSCC zAux_AsmName[] =
      "aux_asm";
 
@@ -1205,7 +1239,7 @@ static const char* apzAux_AsmPatch[] = {
  *
  *  Description of Avoid_Bool_Define fix
  */
-#define AVOID_BOOL_DEFINE_FIXIDX         26
+#define AVOID_BOOL_DEFINE_FIXIDX         27
 tSCC zAvoid_Bool_DefineName[] =
      "avoid_bool_define";
 
@@ -1251,7 +1285,7 @@ static const char* apzAvoid_Bool_DefinePatch[] = {
  *
  *  Description of Avoid_Bool_Type fix
  */
-#define AVOID_BOOL_TYPE_FIXIDX           27
+#define AVOID_BOOL_TYPE_FIXIDX           28
 tSCC zAvoid_Bool_TypeName[] =
      "avoid_bool_type";
 
@@ -1296,7 +1330,7 @@ static const char* apzAvoid_Bool_TypePatch[] = {
  *
  *  Description of Avoid_Wchar_T_Type fix
  */
-#define AVOID_WCHAR_T_TYPE_FIXIDX        28
+#define AVOID_WCHAR_T_TYPE_FIXIDX        29
 tSCC zAvoid_Wchar_T_TypeName[] =
      "avoid_wchar_t_type";
 
@@ -1333,7 +1367,7 @@ static const char* apzAvoid_Wchar_T_TypePatch[] = {
  *
  *  Description of Bad_Lval fix
  */
-#define BAD_LVAL_FIXIDX                  29
+#define BAD_LVAL_FIXIDX                  30
 tSCC zBad_LvalName[] =
      "bad_lval";
 
@@ -1368,7 +1402,7 @@ static const char* apzBad_LvalPatch[] = { "sed",
  *
  *  Description of Bad_Struct_Term fix
  */
-#define BAD_STRUCT_TERM_FIXIDX           30
+#define BAD_STRUCT_TERM_FIXIDX           31
 tSCC zBad_Struct_TermName[] =
      "bad_struct_term";
 
@@ -1404,7 +1438,7 @@ static const char* apzBad_Struct_TermPatch[] = {
  *
  *  Description of Badquote fix
  */
-#define BADQUOTE_FIXIDX                  31
+#define BADQUOTE_FIXIDX                  32
 tSCC zBadquoteName[] =
      "badquote";
 
@@ -1440,7 +1474,7 @@ static const char* apzBadquotePatch[] = {
  *
  *  Description of Broken_Assert_Stdio fix
  */
-#define BROKEN_ASSERT_STDIO_FIXIDX       32
+#define BROKEN_ASSERT_STDIO_FIXIDX       33
 tSCC zBroken_Assert_StdioName[] =
      "broken_assert_stdio";
 
@@ -1483,7 +1517,7 @@ static const char* apzBroken_Assert_StdioPatch[] = {
  *
  *  Description of Broken_Assert_Stdlib fix
  */
-#define BROKEN_ASSERT_STDLIB_FIXIDX      33
+#define BROKEN_ASSERT_STDLIB_FIXIDX      34
 tSCC zBroken_Assert_StdlibName[] =
      "broken_assert_stdlib";
 
@@ -1528,7 +1562,7 @@ static const char* apzBroken_Assert_StdlibPatch[] = {
  *
  *  Description of Broken_Cabs fix
  */
-#define BROKEN_CABS_FIXIDX               34
+#define BROKEN_CABS_FIXIDX               35
 tSCC zBroken_CabsName[] =
      "broken_cabs";
 
@@ -1565,7 +1599,7 @@ static const char* apzBroken_CabsPatch[] = {
  *
  *  Description of Ctrl_Quotes_Def fix
  */
-#define CTRL_QUOTES_DEF_FIXIDX           35
+#define CTRL_QUOTES_DEF_FIXIDX           36
 tSCC zCtrl_Quotes_DefName[] =
      "ctrl_quotes_def";
 
@@ -1600,7 +1634,7 @@ static const char* apzCtrl_Quotes_DefPatch[] = {
  *
  *  Description of Ctrl_Quotes_Use fix
  */
-#define CTRL_QUOTES_USE_FIXIDX           36
+#define CTRL_QUOTES_USE_FIXIDX           37
 tSCC zCtrl_Quotes_UseName[] =
      "ctrl_quotes_use";
 
@@ -1635,7 +1669,7 @@ static const char* apzCtrl_Quotes_UsePatch[] = {
  *
  *  Description of Cxx_Unready fix
  */
-#define CXX_UNREADY_FIXIDX               37
+#define CXX_UNREADY_FIXIDX               38
 tSCC zCxx_UnreadyName[] =
      "cxx_unready";
 
@@ -1683,7 +1717,7 @@ extern \"C\" {\n\
  *
  *  Description of Dec_Intern_Asm fix
  */
-#define DEC_INTERN_ASM_FIXIDX            38
+#define DEC_INTERN_ASM_FIXIDX            39
 tSCC zDec_Intern_AsmName[] =
      "dec_intern_asm";
 
@@ -1713,7 +1747,7 @@ static const char* apzDec_Intern_AsmPatch[] = { "sed",
  *
  *  Description of Djgpp_Wchar_H fix
  */
-#define DJGPP_WCHAR_H_FIXIDX             39
+#define DJGPP_WCHAR_H_FIXIDX             40
 tSCC zDjgpp_Wchar_HName[] =
      "djgpp_wchar_h";
 
@@ -1757,7 +1791,7 @@ static const char* apzDjgpp_Wchar_HPatch[] = {
  *
  *  Description of Ecd_Cursor fix
  */
-#define ECD_CURSOR_FIXIDX                40
+#define ECD_CURSOR_FIXIDX                41
 tSCC zEcd_CursorName[] =
      "ecd_cursor";
 
@@ -1793,7 +1827,7 @@ static const char* apzEcd_CursorPatch[] = {
  *
  *  Description of Fix_Header_Breakage fix
  */
-#define FIX_HEADER_BREAKAGE_FIXIDX       41
+#define FIX_HEADER_BREAKAGE_FIXIDX       42
 tSCC zFix_Header_BreakageName[] =
      "fix_header_breakage";
 
@@ -1831,7 +1865,7 @@ static const char* apzFix_Header_BreakagePatch[] = {
  *
  *  Description of Freebsd_Gcc3_Breakage fix
  */
-#define FREEBSD_GCC3_BREAKAGE_FIXIDX     42
+#define FREEBSD_GCC3_BREAKAGE_FIXIDX     43
 tSCC zFreebsd_Gcc3_BreakageName[] =
      "freebsd_gcc3_breakage";
 
@@ -1876,7 +1910,7 @@ static const char* apzFreebsd_Gcc3_BreakagePatch[] = {
  *
  *  Description of Hp_Inline fix
  */
-#define HP_INLINE_FIXIDX                 43
+#define HP_INLINE_FIXIDX                 44
 tSCC zHp_InlineName[] =
      "hp_inline";
 
@@ -1913,7 +1947,7 @@ static const char* apzHp_InlinePatch[] = {
  *
  *  Description of Hp_Sysfile fix
  */
-#define HP_SYSFILE_FIXIDX                44
+#define HP_SYSFILE_FIXIDX                45
 tSCC zHp_SysfileName[] =
      "hp_sysfile";
 
@@ -1950,7 +1984,7 @@ static const char* apzHp_SysfilePatch[] = {
  *
  *  Description of Hpux11_Fabsf fix
  */
-#define HPUX11_FABSF_FIXIDX              45
+#define HPUX11_FABSF_FIXIDX              46
 tSCC zHpux11_FabsfName[] =
      "hpux11_fabsf";
 
@@ -1995,7 +2029,7 @@ static const char* apzHpux11_FabsfPatch[] = {
  *
  *  Description of Hpux11_Uint32_C fix
  */
-#define HPUX11_UINT32_C_FIXIDX           46
+#define HPUX11_UINT32_C_FIXIDX           47
 tSCC zHpux11_Uint32_CName[] =
      "hpux11_uint32_c";
 
@@ -2031,7 +2065,7 @@ static const char* apzHpux11_Uint32_CPatch[] = {
  *
  *  Description of Hpux8_Bogus_Inlines fix
  */
-#define HPUX8_BOGUS_INLINES_FIXIDX       47
+#define HPUX8_BOGUS_INLINES_FIXIDX       48
 tSCC zHpux8_Bogus_InlinesName[] =
      "hpux8_bogus_inlines";
 
@@ -2069,7 +2103,7 @@ static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
  *
  *  Description of Int_Abort_Free_And_Exit fix
  */
-#define INT_ABORT_FREE_AND_EXIT_FIXIDX   48
+#define INT_ABORT_FREE_AND_EXIT_FIXIDX   49
 tSCC zInt_Abort_Free_And_ExitName[] =
      "int_abort_free_and_exit";
 
@@ -2105,7 +2139,7 @@ static const char* apzInt_Abort_Free_And_ExitPatch[] = {
  *
  *  Description of Isc_Omits_With_Stdc fix
  */
-#define ISC_OMITS_WITH_STDC_FIXIDX       49
+#define ISC_OMITS_WITH_STDC_FIXIDX       50
 tSCC zIsc_Omits_With_StdcName[] =
      "isc_omits_with_stdc";
 
@@ -2141,7 +2175,7 @@ static const char* apzIsc_Omits_With_StdcPatch[] = {
  *
  *  Description of Io_Quotes_Def fix
  */
-#define IO_QUOTES_DEF_FIXIDX             50
+#define IO_QUOTES_DEF_FIXIDX             51
 tSCC zIo_Quotes_DefName[] =
      "io_quotes_def";
 
@@ -2176,7 +2210,7 @@ static const char* apzIo_Quotes_DefPatch[] = {
  *
  *  Description of Io_Quotes_Use fix
  */
-#define IO_QUOTES_USE_FIXIDX             51
+#define IO_QUOTES_USE_FIXIDX             52
 tSCC zIo_Quotes_UseName[] =
      "io_quotes_use";
 
@@ -2211,7 +2245,7 @@ static const char* apzIo_Quotes_UsePatch[] = {
  *
  *  Description of Hpux_Maxint fix
  */
-#define HPUX_MAXINT_FIXIDX               52
+#define HPUX_MAXINT_FIXIDX               53
 tSCC zHpux_MaxintName[] =
      "hpux_maxint";
 
@@ -2264,7 +2298,7 @@ static const char* apzHpux_MaxintPatch[] = {
  *
  *  Description of Hpux_Systime fix
  */
-#define HPUX_SYSTIME_FIXIDX              53
+#define HPUX_SYSTIME_FIXIDX              54
 tSCC zHpux_SystimeName[] =
      "hpux_systime";
 
@@ -2300,7 +2334,7 @@ static const char* apzHpux_SystimePatch[] = {
  *
  *  Description of Ip_Missing_Semi fix
  */
-#define IP_MISSING_SEMI_FIXIDX           54
+#define IP_MISSING_SEMI_FIXIDX           55
 tSCC zIp_Missing_SemiName[] =
      "ip_missing_semi";
 
@@ -2335,7 +2369,7 @@ static const char* apzIp_Missing_SemiPatch[] = { "sed",
  *
  *  Description of Irix_Asm_Apostrophe fix
  */
-#define IRIX_ASM_APOSTROPHE_FIXIDX       55
+#define IRIX_ASM_APOSTROPHE_FIXIDX       56
 tSCC zIrix_Asm_ApostropheName[] =
      "irix_asm_apostrophe";
 
@@ -2372,7 +2406,7 @@ static const char* apzIrix_Asm_ApostrophePatch[] = {
  *
  *  Description of Irix_Limits_Const fix
  */
-#define IRIX_LIMITS_CONST_FIXIDX         56
+#define IRIX_LIMITS_CONST_FIXIDX         57
 tSCC zIrix_Limits_ConstName[] =
      "irix_limits_const";
 
@@ -2408,7 +2442,7 @@ static const char* apzIrix_Limits_ConstPatch[] = {
  *
  *  Description of Isc_Fmod fix
  */
-#define ISC_FMOD_FIXIDX                  57
+#define ISC_FMOD_FIXIDX                  58
 tSCC zIsc_FmodName[] =
      "isc_fmod";
 
@@ -2444,7 +2478,7 @@ static const char* apzIsc_FmodPatch[] = {
  *
  *  Description of Kandr_Concat fix
  */
-#define KANDR_CONCAT_FIXIDX              58
+#define KANDR_CONCAT_FIXIDX              59
 tSCC zKandr_ConcatName[] =
      "kandr_concat";
 
@@ -2480,7 +2514,7 @@ static const char* apzKandr_ConcatPatch[] = {
  *
  *  Description of Libc1_Ifdefd_Memx fix
  */
-#define LIBC1_IFDEFD_MEMX_FIXIDX         59
+#define LIBC1_IFDEFD_MEMX_FIXIDX         60
 tSCC zLibc1_Ifdefd_MemxName[] =
      "libc1_ifdefd_memx";
 
@@ -2529,7 +2563,7 @@ extern [a-z_]+ mem.*(\n\
  *
  *  Description of Limits_Ifndefs fix
  */
-#define LIMITS_IFNDEFS_FIXIDX            60
+#define LIMITS_IFNDEFS_FIXIDX            61
 tSCC zLimits_IfndefsName[] =
      "limits_ifndefs";
 
@@ -2568,7 +2602,7 @@ static const char* apzLimits_IfndefsPatch[] = {
  *
  *  Description of Lynx_Void_Int fix
  */
-#define LYNX_VOID_INT_FIXIDX             61
+#define LYNX_VOID_INT_FIXIDX             62
 tSCC zLynx_Void_IntName[] =
      "lynx_void_int";
 
@@ -2604,7 +2638,7 @@ static const char* apzLynx_Void_IntPatch[] = {
  *
  *  Description of Lynxos_Fcntl_Proto fix
  */
-#define LYNXOS_FCNTL_PROTO_FIXIDX        62
+#define LYNXOS_FCNTL_PROTO_FIXIDX        63
 tSCC zLynxos_Fcntl_ProtoName[] =
      "lynxos_fcntl_proto";
 
@@ -2641,7 +2675,7 @@ static const char* apzLynxos_Fcntl_ProtoPatch[] = {
  *
  *  Description of M88k_Bad_Hypot_Opt fix
  */
-#define M88K_BAD_HYPOT_OPT_FIXIDX        63
+#define M88K_BAD_HYPOT_OPT_FIXIDX        64
 tSCC zM88k_Bad_Hypot_OptName[] =
      "m88k_bad_hypot_opt";
 
@@ -2690,7 +2724,7 @@ static __inline__ double fake_hypot (x, y)\n\
  *
  *  Description of M88k_Bad_S_If fix
  */
-#define M88K_BAD_S_IF_FIXIDX             64
+#define M88K_BAD_S_IF_FIXIDX             65
 tSCC zM88k_Bad_S_IfName[] =
      "m88k_bad_s_if";
 
@@ -2729,7 +2763,7 @@ static const char* apzM88k_Bad_S_IfPatch[] = {
  *
  *  Description of M88k_Multi_Incl fix
  */
-#define M88K_MULTI_INCL_FIXIDX           65
+#define M88K_MULTI_INCL_FIXIDX           66
 tSCC zM88k_Multi_InclName[] =
      "m88k_multi_incl";
 
@@ -2766,7 +2800,7 @@ static const char* apzM88k_Multi_InclPatch[] = {
  *
  *  Description of Machine_Ansi_H_Va_List fix
  */
-#define MACHINE_ANSI_H_VA_LIST_FIXIDX    66
+#define MACHINE_ANSI_H_VA_LIST_FIXIDX    67
 tSCC zMachine_Ansi_H_Va_ListName[] =
      "machine_ansi_h_va_list";
 
@@ -2809,7 +2843,7 @@ static const char* apzMachine_Ansi_H_Va_ListPatch[] = {
  *
  *  Description of Machine_Name fix
  */
-#define MACHINE_NAME_FIXIDX              67
+#define MACHINE_NAME_FIXIDX              68
 tSCC zMachine_NameName[] =
      "machine_name";
 
@@ -2842,7 +2876,7 @@ static const char* apzMachine_NamePatch[] = {
  *
  *  Description of Math_Exception fix
  */
-#define MATH_EXCEPTION_FIXIDX            68
+#define MATH_EXCEPTION_FIXIDX            69
 tSCC zMath_ExceptionName[] =
      "math_exception";
 
@@ -2890,7 +2924,7 @@ static const char* apzMath_ExceptionPatch[] = {
  *
  *  Description of Math_Huge_Val_From_Dbl_Max fix
  */
-#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 69
+#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 70
 tSCC zMath_Huge_Val_From_Dbl_MaxName[] =
      "math_huge_val_from_dbl_max";
 
@@ -2937,7 +2971,7 @@ static const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c",
  *
  *  Description of Math_Huge_Val_Ifndef fix
  */
-#define MATH_HUGE_VAL_IFNDEF_FIXIDX      70
+#define MATH_HUGE_VAL_IFNDEF_FIXIDX      71
 tSCC zMath_Huge_Val_IfndefName[] =
      "math_huge_val_ifndef";
 
@@ -2976,7 +3010,7 @@ static const char* apzMath_Huge_Val_IfndefPatch[] = {
  *
  *  Description of Nested_Motorola fix
  */
-#define NESTED_MOTOROLA_FIXIDX           71
+#define NESTED_MOTOROLA_FIXIDX           72
 tSCC zNested_MotorolaName[] =
      "nested_motorola";
 
@@ -3014,7 +3048,7 @@ static const char* apzNested_MotorolaPatch[] = { "sed",
  *
  *  Description of Nested_Sys_Limits fix
  */
-#define NESTED_SYS_LIMITS_FIXIDX         72
+#define NESTED_SYS_LIMITS_FIXIDX         73
 tSCC zNested_Sys_LimitsName[] =
      "nested_sys_limits";
 
@@ -3050,7 +3084,7 @@ static const char* apzNested_Sys_LimitsPatch[] = { "sed",
  *
  *  Description of Nested_Auth_Des fix
  */
-#define NESTED_AUTH_DES_FIXIDX           73
+#define NESTED_AUTH_DES_FIXIDX           74
 tSCC zNested_Auth_DesName[] =
      "nested_auth_des";
 
@@ -3086,7 +3120,7 @@ static const char* apzNested_Auth_DesPatch[] = {
  *
  *  Description of News_Os_Recursion fix
  */
-#define NEWS_OS_RECURSION_FIXIDX         74
+#define NEWS_OS_RECURSION_FIXIDX         75
 tSCC zNews_Os_RecursionName[] =
      "news_os_recursion";
 
@@ -3124,7 +3158,7 @@ static const char* apzNews_Os_RecursionPatch[] = {
  *
  *  Description of Next_Math_Prefix fix
  */
-#define NEXT_MATH_PREFIX_FIXIDX          75
+#define NEXT_MATH_PREFIX_FIXIDX          76
 tSCC zNext_Math_PrefixName[] =
      "next_math_prefix";
 
@@ -3161,7 +3195,7 @@ static const char* apzNext_Math_PrefixPatch[] = {
  *
  *  Description of Next_Template fix
  */
-#define NEXT_TEMPLATE_FIXIDX             76
+#define NEXT_TEMPLATE_FIXIDX             77
 tSCC zNext_TemplateName[] =
      "next_template";
 
@@ -3198,7 +3232,7 @@ static const char* apzNext_TemplatePatch[] = {
  *
  *  Description of Next_Volitile fix
  */
-#define NEXT_VOLITILE_FIXIDX             77
+#define NEXT_VOLITILE_FIXIDX             78
 tSCC zNext_VolitileName[] =
      "next_volitile";
 
@@ -3235,7 +3269,7 @@ static const char* apzNext_VolitilePatch[] = {
  *
  *  Description of Next_Wait_Union fix
  */
-#define NEXT_WAIT_UNION_FIXIDX           78
+#define NEXT_WAIT_UNION_FIXIDX           79
 tSCC zNext_Wait_UnionName[] =
      "next_wait_union";
 
@@ -3271,7 +3305,7 @@ static const char* apzNext_Wait_UnionPatch[] = {
  *
  *  Description of Nodeent_Syntax fix
  */
-#define NODEENT_SYNTAX_FIXIDX            79
+#define NODEENT_SYNTAX_FIXIDX            80
 tSCC zNodeent_SyntaxName[] =
      "nodeent_syntax";
 
@@ -3307,7 +3341,7 @@ static const char* apzNodeent_SyntaxPatch[] = {
  *
  *  Description of Osf_Namespace_A fix
  */
-#define OSF_NAMESPACE_A_FIXIDX           80
+#define OSF_NAMESPACE_A_FIXIDX           81
 tSCC zOsf_Namespace_AName[] =
      "osf_namespace_a";
 
@@ -3353,7 +3387,7 @@ static const char* apzOsf_Namespace_APatch[] = {
  *
  *  Description of Osf_Namespace_C fix
  */
-#define OSF_NAMESPACE_C_FIXIDX           81
+#define OSF_NAMESPACE_C_FIXIDX           82
 tSCC zOsf_Namespace_CName[] =
      "osf_namespace_c";
 
@@ -3408,7 +3442,7 @@ typedef __regmatch_t\tregmatch_t;",
  *
  *  Description of Pthread_Page_Size fix
  */
-#define PTHREAD_PAGE_SIZE_FIXIDX         82
+#define PTHREAD_PAGE_SIZE_FIXIDX         83
 tSCC zPthread_Page_SizeName[] =
      "pthread_page_size";
 
@@ -3444,7 +3478,7 @@ static const char* apzPthread_Page_SizePatch[] = {
  *
  *  Description of Read_Ret_Type fix
  */
-#define READ_RET_TYPE_FIXIDX             83
+#define READ_RET_TYPE_FIXIDX             84
 tSCC zRead_Ret_TypeName[] =
      "read_ret_type";
 
@@ -3482,7 +3516,7 @@ static const char* apzRead_Ret_TypePatch[] = {
  *
  *  Description of Rs6000_Double fix
  */
-#define RS6000_DOUBLE_FIXIDX             84
+#define RS6000_DOUBLE_FIXIDX             85
 tSCC zRs6000_DoubleName[] =
      "rs6000_double";
 
@@ -3521,7 +3555,7 @@ static const char* apzRs6000_DoublePatch[] = {
  *
  *  Description of Rs6000_Fchmod fix
  */
-#define RS6000_FCHMOD_FIXIDX             85
+#define RS6000_FCHMOD_FIXIDX             86
 tSCC zRs6000_FchmodName[] =
      "rs6000_fchmod";
 
@@ -3557,7 +3591,7 @@ static const char* apzRs6000_FchmodPatch[] = {
  *
  *  Description of Rs6000_Param fix
  */
-#define RS6000_PARAM_FIXIDX              86
+#define RS6000_PARAM_FIXIDX              87
 tSCC zRs6000_ParamName[] =
      "rs6000_param";
 
@@ -3593,7 +3627,7 @@ static const char* apzRs6000_ParamPatch[] = {
  *
  *  Description of Sco_Static_Func fix
  */
-#define SCO_STATIC_FUNC_FIXIDX           87
+#define SCO_STATIC_FUNC_FIXIDX           88
 tSCC zSco_Static_FuncName[] =
      "sco_static_func";
 
@@ -3637,7 +3671,7 @@ extern \"C\" {\\\n\
  *
  *  Description of Strict_Ansi_Not fix
  */
-#define STRICT_ANSI_NOT_FIXIDX           88
+#define STRICT_ANSI_NOT_FIXIDX           89
 tSCC zStrict_Ansi_NotName[] =
      "strict_ansi_not";
 
@@ -3672,7 +3706,7 @@ static const char* apzStrict_Ansi_NotPatch[] = {
  *
  *  Description of Strict_Ansi_Not_Ctd fix
  */
-#define STRICT_ANSI_NOT_CTD_FIXIDX       89
+#define STRICT_ANSI_NOT_CTD_FIXIDX       90
 tSCC zStrict_Ansi_Not_CtdName[] =
      "strict_ansi_not_ctd";
 
@@ -3708,7 +3742,7 @@ static const char* apzStrict_Ansi_Not_CtdPatch[] = {
  *
  *  Description of Strict_Ansi_Only fix
  */
-#define STRICT_ANSI_ONLY_FIXIDX          90
+#define STRICT_ANSI_ONLY_FIXIDX          91
 tSCC zStrict_Ansi_OnlyName[] =
      "strict_ansi_only";
 
@@ -3743,7 +3777,7 @@ static const char* apzStrict_Ansi_OnlyPatch[] = {
  *
  *  Description of Sco_Utime fix
  */
-#define SCO_UTIME_FIXIDX                 91
+#define SCO_UTIME_FIXIDX                 92
 tSCC zSco_UtimeName[] =
      "sco_utime";
 
@@ -3781,7 +3815,7 @@ static const char* apzSco_UtimePatch[] = {
  *
  *  Description of Statsswtch fix
  */
-#define STATSSWTCH_FIXIDX                92
+#define STATSSWTCH_FIXIDX                93
 tSCC zStatsswtchName[] =
      "statsswtch";
 
@@ -3817,7 +3851,7 @@ static const char* apzStatsswtchPatch[] = {
  *
  *  Description of Stdio_Stdarg_H fix
  */
-#define STDIO_STDARG_H_FIXIDX            93
+#define STDIO_STDARG_H_FIXIDX            94
 tSCC zStdio_Stdarg_HName[] =
      "stdio_stdarg_h";
 
@@ -3854,7 +3888,7 @@ static const char* apzStdio_Stdarg_HPatch[] = {
  *
  *  Description of Stdio_Va_List fix
  */
-#define STDIO_VA_LIST_FIXIDX             94
+#define STDIO_VA_LIST_FIXIDX             95
 tSCC zStdio_Va_ListName[] =
      "stdio_va_list";
 
@@ -3899,7 +3933,7 @@ s@_Va_LIST@_VA_LIST@",
  *
  *  Description of Struct_File fix
  */
-#define STRUCT_FILE_FIXIDX               95
+#define STRUCT_FILE_FIXIDX               96
 tSCC zStruct_FileName[] =
      "struct_file";
 
@@ -3936,7 +3970,7 @@ static const char* apzStruct_FilePatch[] = {
  *
  *  Description of Struct_Sockaddr fix
  */
-#define STRUCT_SOCKADDR_FIXIDX           96
+#define STRUCT_SOCKADDR_FIXIDX           97
 tSCC zStruct_SockaddrName[] =
      "struct_sockaddr";
 
@@ -3980,7 +4014,7 @@ static const char* apzStruct_SockaddrPatch[] = {
  *
  *  Description of Sun_Auth_Proto fix
  */
-#define SUN_AUTH_PROTO_FIXIDX            97
+#define SUN_AUTH_PROTO_FIXIDX            98
 tSCC zSun_Auth_ProtoName[] =
      "sun_auth_proto";
 
@@ -4021,7 +4055,7 @@ static const char* apzSun_Auth_ProtoPatch[] = {
  *
  *  Description of Sun_Bogus_Ifdef fix
  */
-#define SUN_BOGUS_IFDEF_FIXIDX           98
+#define SUN_BOGUS_IFDEF_FIXIDX           99
 tSCC zSun_Bogus_IfdefName[] =
      "sun_bogus_ifdef";
 
@@ -4057,7 +4091,7 @@ static const char* apzSun_Bogus_IfdefPatch[] = {
  *
  *  Description of Sun_Catmacro fix
  */
-#define SUN_CATMACRO_FIXIDX              99
+#define SUN_CATMACRO_FIXIDX              100
 tSCC zSun_CatmacroName[] =
      "sun_catmacro";
 
@@ -4097,7 +4131,7 @@ static const char* apzSun_CatmacroPatch[] = {
  *
  *  Description of Sun_Malloc fix
  */
-#define SUN_MALLOC_FIXIDX                100
+#define SUN_MALLOC_FIXIDX                101
 tSCC zSun_MallocName[] =
      "sun_malloc";
 
@@ -4128,7 +4162,7 @@ static const char* apzSun_MallocPatch[] = { "sed",
  *
  *  Description of Sun_Rusers_Semi fix
  */
-#define SUN_RUSERS_SEMI_FIXIDX           101
+#define SUN_RUSERS_SEMI_FIXIDX           102
 tSCC zSun_Rusers_SemiName[] =
      "sun_rusers_semi";
 
@@ -4163,7 +4197,7 @@ static const char* apzSun_Rusers_SemiPatch[] = { "sed",
  *
  *  Description of Sun_Signal fix
  */
-#define SUN_SIGNAL_FIXIDX                102
+#define SUN_SIGNAL_FIXIDX                103
 tSCC zSun_SignalName[] =
      "sun_signal";
 
@@ -4203,7 +4237,7 @@ void\t(*signal(...))(...);\n\
  *
  *  Description of Sunos_Matherr_Decl fix
  */
-#define SUNOS_MATHERR_DECL_FIXIDX        103
+#define SUNOS_MATHERR_DECL_FIXIDX        104
 tSCC zSunos_Matherr_DeclName[] =
      "sunos_matherr_decl";
 
@@ -4246,7 +4280,7 @@ static const char* apzSunos_Matherr_DeclPatch[] = {
  *
  *  Description of Sunos_Strlen fix
  */
-#define SUNOS_STRLEN_FIXIDX              104
+#define SUNOS_STRLEN_FIXIDX              105
 tSCC zSunos_StrlenName[] =
      "sunos_strlen";
 
@@ -4282,7 +4316,7 @@ static const char* apzSunos_StrlenPatch[] = {
  *
  *  Description of Svr4__P fix
  */
-#define SVR4__P_FIXIDX                   105
+#define SVR4__P_FIXIDX                   106
 tSCC zSvr4__PName[] =
      "svr4__p";
 
@@ -4320,7 +4354,7 @@ static const char* apzSvr4__PPatch[] = {
  *
  *  Description of Svr4_Getcwd fix
  */
-#define SVR4_GETCWD_FIXIDX               106
+#define SVR4_GETCWD_FIXIDX               107
 tSCC zSvr4_GetcwdName[] =
      "svr4_getcwd";
 
@@ -4356,7 +4390,7 @@ static const char* apzSvr4_GetcwdPatch[] = {
  *
  *  Description of Svr4_Profil fix
  */
-#define SVR4_PROFIL_FIXIDX               107
+#define SVR4_PROFIL_FIXIDX               108
 tSCC zSvr4_ProfilName[] =
      "svr4_profil";
 
@@ -4392,7 +4426,7 @@ static const char* apzSvr4_ProfilPatch[] = {
  *
  *  Description of Gnu_Types fix
  */
-#define GNU_TYPES_FIXIDX                 108
+#define GNU_TYPES_FIXIDX                 109
 tSCC zGnu_TypesName[] =
      "gnu_types";
 
@@ -4434,7 +4468,7 @@ static const char* apzGnu_TypesPatch[] = {
  *
  *  Description of Sysv68_String fix
  */
-#define SYSV68_STRING_FIXIDX             109
+#define SYSV68_STRING_FIXIDX             110
 tSCC zSysv68_StringName[] =
      "sysv68_string";
 
@@ -4471,7 +4505,7 @@ extern unsigned int\\\n\
  *
  *  Description of Sysz_Stdlib_For_Sun fix
  */
-#define SYSZ_STDLIB_FOR_SUN_FIXIDX       110
+#define SYSZ_STDLIB_FOR_SUN_FIXIDX       111
 tSCC zSysz_Stdlib_For_SunName[] =
      "sysz_stdlib_for_sun";
 
@@ -4507,7 +4541,7 @@ static const char* apzSysz_Stdlib_For_SunPatch[] = {
  *
  *  Description of Tinfo_Cplusplus fix
  */
-#define TINFO_CPLUSPLUS_FIXIDX           111
+#define TINFO_CPLUSPLUS_FIXIDX           112
 tSCC zTinfo_CplusplusName[] =
      "tinfo_cplusplus";
 
@@ -4543,7 +4577,7 @@ static const char* apzTinfo_CplusplusPatch[] = {
  *
  *  Description of Ultrix_Atof_Param fix
  */
-#define ULTRIX_ATOF_PARAM_FIXIDX         112
+#define ULTRIX_ATOF_PARAM_FIXIDX         113
 tSCC zUltrix_Atof_ParamName[] =
      "ultrix_atof_param";
 
@@ -4579,7 +4613,7 @@ static const char* apzUltrix_Atof_ParamPatch[] = {
  *
  *  Description of Ultrix_Const fix
  */
-#define ULTRIX_CONST_FIXIDX              113
+#define ULTRIX_CONST_FIXIDX              114
 tSCC zUltrix_ConstName[] =
      "ultrix_const";
 
@@ -4616,7 +4650,7 @@ static const char* apzUltrix_ConstPatch[] = {
  *
  *  Description of Ultrix_Const2 fix
  */
-#define ULTRIX_CONST2_FIXIDX             114
+#define ULTRIX_CONST2_FIXIDX             115
 tSCC zUltrix_Const2Name[] =
      "ultrix_const2";
 
@@ -4653,7 +4687,7 @@ static const char* apzUltrix_Const2Patch[] = {
  *
  *  Description of Ultrix_Fix_Fixproto fix
  */
-#define ULTRIX_FIX_FIXPROTO_FIXIDX       115
+#define ULTRIX_FIX_FIXPROTO_FIXIDX       116
 tSCC zUltrix_Fix_FixprotoName[] =
      "ultrix_fix_fixproto";
 
@@ -4691,7 +4725,7 @@ static const char* apzUltrix_Fix_FixprotoPatch[] = {
  *
  *  Description of Ultrix_Ifdef fix
  */
-#define ULTRIX_IFDEF_FIXIDX              116
+#define ULTRIX_IFDEF_FIXIDX              117
 tSCC zUltrix_IfdefName[] =
      "ultrix_ifdef";
 
@@ -4727,7 +4761,7 @@ static const char* apzUltrix_IfdefPatch[] = {
  *
  *  Description of Ultrix_Math_Ifdef fix
  */
-#define ULTRIX_MATH_IFDEF_FIXIDX         117
+#define ULTRIX_MATH_IFDEF_FIXIDX         118
 tSCC zUltrix_Math_IfdefName[] =
      "ultrix_math_ifdef";
 
@@ -4763,7 +4797,7 @@ static const char* apzUltrix_Math_IfdefPatch[] = {
  *
  *  Description of Ultrix_Nested_Ioctl fix
  */
-#define ULTRIX_NESTED_IOCTL_FIXIDX       118
+#define ULTRIX_NESTED_IOCTL_FIXIDX       119
 tSCC zUltrix_Nested_IoctlName[] =
      "ultrix_nested_ioctl";
 
@@ -4798,7 +4832,7 @@ static const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
  *
  *  Description of Ultrix_Nested_Svc fix
  */
-#define ULTRIX_NESTED_SVC_FIXIDX         119
+#define ULTRIX_NESTED_SVC_FIXIDX         120
 tSCC zUltrix_Nested_SvcName[] =
      "ultrix_nested_svc";
 
@@ -4833,7 +4867,7 @@ static const char* apzUltrix_Nested_SvcPatch[] = { "sed",
  *
  *  Description of Ultrix_Stat fix
  */
-#define ULTRIX_STAT_FIXIDX               120
+#define ULTRIX_STAT_FIXIDX               121
 tSCC zUltrix_StatName[] =
      "ultrix_stat";
 
@@ -4874,7 +4908,7 @@ static const char* apzUltrix_StatPatch[] = { "sed",
  *
  *  Description of Ultrix_Static fix
  */
-#define ULTRIX_STATIC_FIXIDX             121
+#define ULTRIX_STATIC_FIXIDX             122
 tSCC zUltrix_StaticName[] =
      "ultrix_static";
 
@@ -4911,7 +4945,7 @@ static const char* apzUltrix_StaticPatch[] = { "sed",
  *
  *  Description of Ultrix_Strings fix
  */
-#define ULTRIX_STRINGS_FIXIDX            122
+#define ULTRIX_STRINGS_FIXIDX            123
 tSCC zUltrix_StringsName[] =
      "ultrix_strings";
 
@@ -4946,7 +4980,7 @@ static const char* apzUltrix_StringsPatch[] = {
  *
  *  Description of Undefine_Null fix
  */
-#define UNDEFINE_NULL_FIXIDX             123
+#define UNDEFINE_NULL_FIXIDX             124
 tSCC zUndefine_NullName[] =
      "undefine_null";
 
@@ -4992,7 +5026,7 @@ static const char* apzUndefine_NullPatch[] = {
  *
  *  Description of Uw7_Byteorder_Fix fix
  */
-#define UW7_BYTEORDER_FIX_FIXIDX         124
+#define UW7_BYTEORDER_FIX_FIXIDX         125
 tSCC zUw7_Byteorder_FixName[] =
      "uw7_byteorder_fix";
 
@@ -5043,7 +5077,7 @@ static const char* apzUw7_Byteorder_FixPatch[] = {
  *
  *  Description of Va_I960_Macro fix
  */
-#define VA_I960_MACRO_FIXIDX             125
+#define VA_I960_MACRO_FIXIDX             126
 tSCC zVa_I960_MacroName[] =
      "va_i960_macro";
 
@@ -5079,7 +5113,7 @@ static const char* apzVa_I960_MacroPatch[] = {
  *
  *  Description of Void_Null fix
  */
-#define VOID_NULL_FIXIDX                 126
+#define VOID_NULL_FIXIDX                 127
 tSCC zVoid_NullName[] =
      "void_null";
 
@@ -5115,7 +5149,7 @@ static const char* apzVoid_NullPatch[] = {
  *
  *  Description of Vxworks_Gcc_Problem fix
  */
-#define VXWORKS_GCC_PROBLEM_FIXIDX       127
+#define VXWORKS_GCC_PROBLEM_FIXIDX       128
 tSCC zVxworks_Gcc_ProblemName[] =
      "vxworks_gcc_problem";
 
@@ -5165,7 +5199,7 @@ static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
  *
  *  Description of Vxworks_Needs_Vxtypes fix
  */
-#define VXWORKS_NEEDS_VXTYPES_FIXIDX     128
+#define VXWORKS_NEEDS_VXTYPES_FIXIDX     129
 tSCC zVxworks_Needs_VxtypesName[] =
      "vxworks_needs_vxtypes";
 
@@ -5201,7 +5235,7 @@ static const char* apzVxworks_Needs_VxtypesPatch[] = {
  *
  *  Description of Vxworks_Needs_Vxworks fix
  */
-#define VXWORKS_NEEDS_VXWORKS_FIXIDX     129
+#define VXWORKS_NEEDS_VXWORKS_FIXIDX     130
 tSCC zVxworks_Needs_VxworksName[] =
      "vxworks_needs_vxworks";
 
@@ -5250,7 +5284,7 @@ static const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
  *
  *  Description of Vxworks_Time fix
  */
-#define VXWORKS_TIME_FIXIDX              130
+#define VXWORKS_TIME_FIXIDX              131
 tSCC zVxworks_TimeName[] =
      "vxworks_time";
 
@@ -5301,7 +5335,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\
  *
  *  Description of X11_Class fix
  */
-#define X11_CLASS_FIXIDX                 131
+#define X11_CLASS_FIXIDX                 132
 tSCC zX11_ClassName[] =
      "x11_class";
 
@@ -5348,7 +5382,7 @@ static const char* apzX11_ClassPatch[] = {
  *
  *  Description of X11_Class_Usage fix
  */
-#define X11_CLASS_USAGE_FIXIDX           132
+#define X11_CLASS_USAGE_FIXIDX           133
 tSCC zX11_Class_UsageName[] =
      "x11_class_usage";
 
@@ -5391,7 +5425,7 @@ static const char* apzX11_Class_UsagePatch[] = {
  *
  *  Description of X11_New fix
  */
-#define X11_NEW_FIXIDX                   133
+#define X11_NEW_FIXIDX                   134
 tSCC zX11_NewName[] =
      "x11_new";
 
@@ -5432,7 +5466,7 @@ static const char* apzX11_NewPatch[] = { "sed",
  *
  *  Description of X11_Sprintf fix
  */
-#define X11_SPRINTF_FIXIDX               134
+#define X11_SPRINTF_FIXIDX               135
 tSCC zX11_SprintfName[] =
      "x11_sprintf";
 
@@ -5471,9 +5505,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          142
+#define REGEX_COUNT          143
 #define MACH_LIST_SIZE_LIMIT 279
-#define FIX_COUNT            135
+#define FIX_COUNT            136
 
 tFixDesc fixDescList[ FIX_COUNT ] = {
   {  zAaa_Ki_IfaceName,    zAaa_Ki_IfaceList,
@@ -5496,6 +5530,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      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,
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 192c89ab0f0..931dae0dcae 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -60,6 +60,18 @@ fix = {
 
 
 /*
+ * Tru64 UNIX V4.0F/V5.1 <standards.h> defines _NO_PROTO and _NONSTD_TYPES
+ * correctly for GCC, but strict_ansi_not breaks it.
+ */
+fix = {
+    hackname = AAA_standards;
+    files    = standards.h;
+    select   = 'GNU and MIPS C compilers define __STDC__ differently';
+    replace; /* empty replacement -> no fixing the file */
+};
+
+
+/*
  *  This file on SunOS 4 has a very large macro.  When the sed loop
  *  tries pull it in, it overflows the pattern space size of the SunOS
  *  sed (GNU sed does not have this problem).  Since the file does not
@@ -86,7 +98,7 @@ fix = {
 /* And now, the real fixes, replacement text fixes first: */
 
 /*
- *  Completely replace &lt;_int_varargs.h&gt; with a file that includes gcc's
+ *  Completely replace <_int_varargs.h> with a file that includes gcc's
  *  stdarg.h or varargs.h files as appropriate on DG/UX
  */
 fix = {
@@ -105,7 +117,7 @@ fix = {
 */
 
 \#ifndef ___int_features_h
-\#include &lt;sys/_int_features.h&gt;
+\#include <sys/_int_features.h>
 \#endif
 
 \#if !(defined(_VA_LIST) || defined(_VA_LIST_))