OSDN Git Service

PR libfortran/41169
[pf3gnuchains/gcc-fork.git] / fixincludes / fixincl.x
index f0459b2..d9c194f 100644 (file)
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Friday July  3, 2009 at 10:27:01 PM CEST
+ * It has been AutoGen-ed  Wednesday September  2, 2009 at 04:57:56 PM MEST
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Jul  3 22:27:01 CEST 2009
+/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Sep  2 16:57:56 MEST 2009
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -15,7 +15,7 @@
  * 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 196 fixup descriptions.
+ * This file contains 206 fixup descriptions.
  *
  * See README for more information.
  *
@@ -485,6 +485,43 @@ static const char* apzAab_Sun_MemcpyPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Aix_Complex fix
+ */
+tSCC zAix_ComplexName[] =
+     "aix_complex";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_ComplexList[] =
+  "complex.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_ComplexMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_ComplexSelect0[] =
+       "#define[ \t]_Complex_I[ \t]__I";
+
+#define    AIX_COMPLEX_TEST_CT  1
+static tTestDesc aAix_ComplexTests[] = {
+  { TT_EGREP,    zAix_ComplexSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Complex
+ */
+static const char* apzAix_ComplexPatch[] = {
+    "format",
+    "#define _Complex_I (__extension__ 1.0iF)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Aix_Pthread fix
  */
 tSCC zAix_PthreadName[] =
@@ -522,6 +559,219 @@ static const char* apzAix_PthreadPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Aix_Stdint_1 fix
+ */
+tSCC zAix_Stdint_1Name[] =
+     "aix_stdint_1";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Stdint_1List[] =
+  "stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Stdint_1Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Stdint_1Select0[] =
+       "#define[ \t]UINT8_MAX[ \t]\\(255U\\)\n\
+#define[ \t]UINT16_MAX[ \t]\\(65535U\\)";
+
+#define    AIX_STDINT_1_TEST_CT  1
+static tTestDesc aAix_Stdint_1Tests[] = {
+  { TT_EGREP,    zAix_Stdint_1Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Stdint_1
+ */
+static const char* apzAix_Stdint_1Patch[] = {
+    "format",
+    "#define UINT8_MAX\t(255)\n\
+#define UINT16_MAX\t(65535)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Stdint_2 fix
+ */
+tSCC zAix_Stdint_2Name[] =
+     "aix_stdint_2";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Stdint_2List[] =
+  "stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Stdint_2Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Stdint_2Select0[] =
+       "#define[ \t]INTPTR_MIN[ \t]INT64_MIN\n\
+#define[ \t]INTPTR_MAX[ \t]INT64_MAX\n\
+#define[ \t]UINTPTR_MAX[ \t]UINT64_MAX\n\
+#else\n\
+#define[ \t]INTPTR_MIN[ \t]INT32_MIN\n\
+#define[ \t]INTPTR_MAX[ \t]INT32_MAX\n\
+#define[ \t]UINTPTR_MAX[ \t]UINT32_MAX";
+
+#define    AIX_STDINT_2_TEST_CT  1
+static tTestDesc aAix_Stdint_2Tests[] = {
+  { TT_EGREP,    zAix_Stdint_2Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Stdint_2
+ */
+static const char* apzAix_Stdint_2Patch[] = {
+    "format",
+    "#define INTPTR_MIN\t(-INTPTR_MAX-1)\n\
+#define INTPTR_MAX\t9223372036854775807L\n\
+#define UINTPTR_MAX\t18446744073709551615UL\n\
+#else\n\
+#define INTPTR_MIN\t(-INTPTR_MAX-1)\n\
+#define INTPTR_MAX\t2147483647L\n\
+#define UINTPTR_MAX\t4294967295UL",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Stdint_3 fix
+ */
+tSCC zAix_Stdint_3Name[] =
+     "aix_stdint_3";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Stdint_3List[] =
+  "stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Stdint_3Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Stdint_3Select0[] =
+       "#define[ \t]PTRDIFF_MIN[ \t]INT64_MIN\n\
+#define[ \t]PTRDIFF_MAX[ \t]INT64_MAX\n\
+#else\n\
+#define[ \t]PTRDIFF_MIN[ \t]*INT32_MIN\n\
+#define[ \t]PTRDIFF_MAX[ \t]*INT32_MAX";
+
+#define    AIX_STDINT_3_TEST_CT  1
+static tTestDesc aAix_Stdint_3Tests[] = {
+  { TT_EGREP,    zAix_Stdint_3Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Stdint_3
+ */
+static const char* apzAix_Stdint_3Patch[] = {
+    "format",
+    "#define PTRDIFF_MIN\t(-9223372036854775807L - 1)\n\
+#define PTRDIFF_MAX\t9223372036854775807L\n\
+#else\n\
+#define PTRDIFF_MIN\t(-2147483647L - 1)\n\
+#define PTRDIFF_MAX\t2147483647L",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Stdint_4 fix
+ */
+tSCC zAix_Stdint_4Name[] =
+     "aix_stdint_4";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Stdint_4List[] =
+  "stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Stdint_4Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Stdint_4Select0[] =
+       "#define[ \t]SIZE_MAX[ \t]UINT64_MAX\n\
+#else\n\
+#define[ \t]SIZE_MAX[ \t]*UINT32_MAX";
+
+#define    AIX_STDINT_4_TEST_CT  1
+static tTestDesc aAix_Stdint_4Tests[] = {
+  { TT_EGREP,    zAix_Stdint_4Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Stdint_4
+ */
+static const char* apzAix_Stdint_4Patch[] = {
+    "format",
+    "#define SIZE_MAX\t18446744073709551615UL\n\
+#else\n\
+#define SIZE_MAX\t4294967295UL",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Aix_Stdint_5 fix
+ */
+tSCC zAix_Stdint_5Name[] =
+     "aix_stdint_5";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Stdint_5List[] =
+  "stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Stdint_5Machs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Stdint_5Select0[] =
+       "#define[ \t]UINT8_C\\(c\\)[ \t]__CONCAT__\\(c,U\\)\n\
+#define[ \t]UINT16_C\\(c\\)[ \t]__CONCAT__\\(c,U\\)";
+
+#define    AIX_STDINT_5_TEST_CT  1
+static tTestDesc aAix_Stdint_5Tests[] = {
+  { TT_EGREP,    zAix_Stdint_5Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Stdint_5
+ */
+static const char* apzAix_Stdint_5Patch[] = {
+    "format",
+    "#define UINT8_C(c)\tc\n\
+#define UINT16_C(c)\tc",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Aix_Sysmachine fix
  */
 tSCC zAix_SysmachineName[] =
@@ -1965,6 +2215,146 @@ static const char* apzDarwin_Stdint_4Patch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Darwin_Stdint_5 fix
+ */
+tSCC zDarwin_Stdint_5Name[] =
+     "darwin_stdint_5";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Stdint_5List[] =
+  "stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_5Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Stdint_5Select0[] =
+       "#define INTMAX_MIN[ \t]+INT64_MIN\n\
+#define INTMAX_MAX[ \t]+INT64_MAX\n\n\
+#define UINTMAX_MAX[ \t]+UINT64_MAX";
+
+#define    DARWIN_STDINT_5_TEST_CT  1
+static tTestDesc aDarwin_Stdint_5Tests[] = {
+  { TT_EGREP,    zDarwin_Stdint_5Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Stdint_5
+ */
+static const char* apzDarwin_Stdint_5Patch[] = {
+    "format",
+    "#if __WORDSIZE == 64\n\
+#define INTMAX_MIN   (-9223372036854775807L - 1)\n\
+#define INTMAX_MAX   9223372036854775807L\n\
+#define UINTMAX_MAX  18446744073709551615UL\n\
+#else\n\
+#define INTMAX_MIN   (-9223372036854775807LL - 1)\n\
+#define INTMAX_MAX   9223372036854775807LL\n\
+#define UINTMAX_MAX  18446744073709551615ULL\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Stdint_6 fix
+ */
+tSCC zDarwin_Stdint_6Name[] =
+     "darwin_stdint_6";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Stdint_6List[] =
+  "stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_6Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Stdint_6Select0[] =
+       "#if __WORDSIZE == 64\n\
+#define PTRDIFF_MIN[ \t]+INT64_MIN\n\
+#define PTRDIFF_MAX[ \t]+INT64_MAX\n\
+#else\n\
+#define PTRDIFF_MIN[ \t]+INT32_MIN\n\
+#define PTRDIFF_MAX[ \t]+INT32_MAX\n\
+#endif";
+
+#define    DARWIN_STDINT_6_TEST_CT  1
+static tTestDesc aDarwin_Stdint_6Tests[] = {
+  { TT_EGREP,    zDarwin_Stdint_6Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Stdint_6
+ */
+static const char* apzDarwin_Stdint_6Patch[] = {
+    "format",
+    "#if __WORDSIZE == 64\n\
+#define PTRDIFF_MIN (-9223372036854775807L - 1)\n\
+#define PTRDIFF_MAX 9223372036854775807L\n\
+#else\n\
+#define PTRDIFF_MIN (-2147483647 - 1)\n\
+#define PTRDIFF_MAX 2147483647\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Stdint_7 fix
+ */
+tSCC zDarwin_Stdint_7Name[] =
+     "darwin_stdint_7";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zDarwin_Stdint_7List[] =
+  "stdint.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Stdint_7Machs[] = {
+        "*-*-darwin*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Stdint_7Select0[] =
+       "#define INTMAX_C\\(v\\)[ \t]+\\(v ## LL\\)\n\
+#define UINTMAX_C\\(v\\)[ \t]+\\(v ## ULL\\)";
+
+#define    DARWIN_STDINT_7_TEST_CT  1
+static tTestDesc aDarwin_Stdint_7Tests[] = {
+  { TT_EGREP,    zDarwin_Stdint_7Select0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Darwin_Stdint_7
+ */
+static const char* apzDarwin_Stdint_7Patch[] = {
+    "format",
+    "#if __WORDSIZE == 64\n\
+#define INTMAX_C(v)  (v ## L)\n\
+#define UINTMAX_C(v) (v ## UL)\n\
+#else\n\
+#define INTMAX_C(v)  (v ## LL)\n\
+#define UINTMAX_C(v) (v ## ULL)\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Dec_Intern_Asm fix
  */
 tSCC zDec_Intern_AsmName[] =
@@ -3638,158 +4028,117 @@ static const char* apzHpux_C99_Inttypes2Patch[] = { sed_cmd_z,
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Stdint_Least fix
+ *  Description of Hpux_Stdint_Least_Fast fix
  */
-tSCC zHpux_Stdint_LeastName[] =
-     "hpux_stdint_least";
+tSCC zHpux_Stdint_Least_FastName[] =
+     "hpux_stdint_least_fast";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_Stdint_LeastList[] =
+tSCC zHpux_Stdint_Least_FastList[] =
   "stdint.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_Stdint_LeastMachs[] = {
+tSCC* apzHpux_Stdint_Least_FastMachs[] = {
         "*-hp-hpux11.2*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_Stdint_LeastSelect0[] =
-       "^[ \t]*#[ \t]*define[ \t]*UINT_LEAST64_MAX[ \t]*ULLONG_MAX";
+tSCC zHpux_Stdint_Least_FastSelect0[] =
+       "^[ \t]*#[ \t]*define[ \t]+UINT_(LEAST|FAST)64_MAX[ \t]+ULLONG_MAX";
 
-#define    HPUX_STDINT_LEAST_TEST_CT  1
-static tTestDesc aHpux_Stdint_LeastTests[] = {
-  { TT_EGREP,    zHpux_Stdint_LeastSelect0, (regex_t*)NULL }, };
+#define    HPUX_STDINT_LEAST_FAST_TEST_CT  1
+static tTestDesc aHpux_Stdint_Least_FastTests[] = {
+  { TT_EGREP,    zHpux_Stdint_Least_FastSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_Stdint_Least
+ *  Fix Command Arguments for Hpux_Stdint_Least_Fast
  */
-static const char* apzHpux_Stdint_LeastPatch[] = {
+static const char* apzHpux_Stdint_Least_FastPatch[] = {
     "format",
     "#ifdef __LP64__\n\
-#  define\tUINT_LEAST64_MAX\tULONG_MAX\n\
+#  define\tUINT_%164_MAX\tULONG_MAX\n\
 #else\n\
 %0\n\
-#endif\n",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Description of Hpux_Stdint_Fast fix
- */
-tSCC zHpux_Stdint_FastName[] =
-     "hpux_stdint_fast";
-
-/*
- *  File name selection pattern
- */
-tSCC zHpux_Stdint_FastList[] =
-  "stdint.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzHpux_Stdint_FastMachs[] = {
-        "*-hp-hpux11.2*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zHpux_Stdint_FastSelect0[] =
-       "^[ \t]*#[ \t]*define[ \t]*UINT_FAST64_MAX[ \t]*ULLONG_MAX";
-
-#define    HPUX_STDINT_FAST_TEST_CT  1
-static tTestDesc aHpux_Stdint_FastTests[] = {
-  { TT_EGREP,    zHpux_Stdint_FastSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Hpux_Stdint_Fast
- */
-static const char* apzHpux_Stdint_FastPatch[] = {
-    "format",
-    "#ifdef __LP64__\n\
-#  define\tUINT_FAST64_MAX\t\tULONG_MAX\n\
-#else\n\
-%0\n\
-#endif\n",
+#endif",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Inttype_Int_Least8_T fix
+ *  Description of Hpux_Inttype_Int8_T fix
  */
-tSCC zHpux_Inttype_Int_Least8_TName[] =
-     "hpux_inttype_int_least8_t";
+tSCC zHpux_Inttype_Int8_TName[] =
+     "hpux_inttype_int8_t";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_Inttype_Int_Least8_TList[] =
+tSCC zHpux_Inttype_Int8_TList[] =
   "sys/_inttypes.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_Inttype_Int_Least8_TMachs[] = {
-        "*-hp-hpux11.*",
+tSCC* apzHpux_Inttype_Int8_TMachs[] = {
+        "*-hp-hpux1[01].*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_Inttype_Int_Least8_TSelect0[] =
-       "^[ \t]*typedef[ \t]*char[ \t]*int_least8_t.*";
+tSCC zHpux_Inttype_Int8_TSelect0[] =
+       "^[ \t]*typedef[ \t]*char[ \t]*int(_least){0,1}8_t.*";
 
-#define    HPUX_INTTYPE_INT_LEAST8_T_TEST_CT  1
-static tTestDesc aHpux_Inttype_Int_Least8_TTests[] = {
-  { TT_EGREP,    zHpux_Inttype_Int_Least8_TSelect0, (regex_t*)NULL }, };
+#define    HPUX_INTTYPE_INT8_T_TEST_CT  1
+static tTestDesc aHpux_Inttype_Int8_TTests[] = {
+  { TT_EGREP,    zHpux_Inttype_Int8_TSelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_Inttype_Int_Least8_T
+ *  Fix Command Arguments for Hpux_Inttype_Int8_T
  */
-static const char* apzHpux_Inttype_Int_Least8_TPatch[] = {
+static const char* apzHpux_Inttype_Int8_TPatch[] = {
     "format",
-    "typedef signed char int_least8_t;",
+    "typedef signed char int%18_t;",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Hpux_Inttype_Int8_T fix
+ *  Description of Hpux_Imaginary_I fix
  */
-tSCC zHpux_Inttype_Int8_TName[] =
-     "hpux_inttype_int8_t";
+tSCC zHpux_Imaginary_IName[] =
+     "hpux_imaginary_i";
 
 /*
  *  File name selection pattern
  */
-tSCC zHpux_Inttype_Int8_TList[] =
-  "sys/_inttypes.h\0";
+tSCC zHpux_Imaginary_IList[] =
+  "complex.h\0";
 /*
  *  Machine/OS name selection pattern
  */
-tSCC* apzHpux_Inttype_Int8_TMachs[] = {
-        "*-hp-hpux11.*",
+tSCC* apzHpux_Imaginary_IMachs[] = {
+        "ia64-hp-hpux11.*",
         (const char*)NULL };
 
 /*
  *  content selection pattern - do fix if pattern found
  */
-tSCC zHpux_Inttype_Int8_TSelect0[] =
-       "^[ \t]*typedef[ \t]*char[ \t]*int8_t.*";
+tSCC zHpux_Imaginary_ISelect0[] =
+       "^[ \t]*#[ \t]*define[ \t]*_Complex_I.*";
 
-#define    HPUX_INTTYPE_INT8_T_TEST_CT  1
-static tTestDesc aHpux_Inttype_Int8_TTests[] = {
-  { TT_EGREP,    zHpux_Inttype_Int8_TSelect0, (regex_t*)NULL }, };
+#define    HPUX_IMAGINARY_I_TEST_CT  1
+static tTestDesc aHpux_Imaginary_ITests[] = {
+  { TT_EGREP,    zHpux_Imaginary_ISelect0, (regex_t*)NULL }, };
 
 /*
- *  Fix Command Arguments for Hpux_Inttype_Int8_T
+ *  Fix Command Arguments for Hpux_Imaginary_I
  */
-static const char* apzHpux_Inttype_Int8_TPatch[] = {
+static const char* apzHpux_Imaginary_IPatch[] = {
     "format",
-    "typedef signed char int8_t;",
+    "#define _Complex_I (__extension__ 1.0iF)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -4222,6 +4571,45 @@ static const char* apzIrix_Asm_ApostrophePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Irix_Complex fix
+ */
+tSCC zIrix_ComplexName[] =
+     "irix_complex";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_ComplexList[] =
+  "complex.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzIrix_ComplexMachs[] = {
+        "mips-sgi-irix6.5",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_ComplexSelect0[] =
+       "#define[ \t]_Complex_I[ \t]\\(\\(float[ \t]_Complex\\)[ \t]\\(__I__\\)\\)";
+
+#define    IRIX_COMPLEX_TEST_CT  1
+static tTestDesc aIrix_ComplexTests[] = {
+  { TT_EGREP,    zIrix_ComplexSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Irix_Complex
+ */
+static const char* apzIrix_ComplexPatch[] = { sed_cmd_z,
+    "-e", "s/#define[ \t]_Complex_I[ \t]((float[ \t]_Complex)[ \t](__I__))/#define _Complex_I (__extension__ 1.0iF)/",
+    "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d",
+    "-e", "/#define[ \t]_Imaginary_I/d",
+    "-e", "s/#define[ \t]I[ \t]_Imaginary_I/#define I _Complex_I/",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Irix_Limits_Const fix
  */
 tSCC zIrix_Limits_ConstName[] =
@@ -5790,6 +6178,45 @@ static const char* apzSco_MathPatch[] = { sed_cmd_z,
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Solaris_Complex fix
+ */
+tSCC zSolaris_ComplexName[] =
+     "solaris_complex";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSolaris_ComplexList[] =
+  "complex.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_ComplexMachs[] = {
+        "*-*-solaris2.*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_ComplexSelect0[] =
+       "#define[ \t]_Complex_I[ \t]_Complex_I";
+
+#define    SOLARIS_COMPLEX_TEST_CT  1
+static tTestDesc aSolaris_ComplexTests[] = {
+  { TT_EGREP,    zSolaris_ComplexSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Solaris_Complex
+ */
+static const char* apzSolaris_ComplexPatch[] = { sed_cmd_z,
+    "-e", "s/#define[ \t]_Complex_I[ \t]_Complex_I/#define\t_Complex_I\t\\(__extension__ 1.0iF\\)/",
+    "-e", "/#define[ \t]_Imaginary_I[ \t]_Imaginary_I/d",
+    "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d",
+    "-e", "s/#define[ \t]I[ \t]\\+_Imaginary_I/#define\tI\t\t_Complex_I/",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Solaris_Math_1 fix
  */
 tSCC zSolaris_Math_1Name[] =
@@ -7953,9 +8380,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          239
+#define REGEX_COUNT          249
 #define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT            196
+#define FIX_COUNT            206
 
 /*
  *  Enumerate the fixes
@@ -7969,7 +8396,13 @@ typedef enum {
     AAB_FD_ZERO_SELECTBITS_H_FIXIDX,
     AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
     AAB_SUN_MEMCPY_FIXIDX,
+    AIX_COMPLEX_FIXIDX,
     AIX_PTHREAD_FIXIDX,
+    AIX_STDINT_1_FIXIDX,
+    AIX_STDINT_2_FIXIDX,
+    AIX_STDINT_3_FIXIDX,
+    AIX_STDINT_4_FIXIDX,
+    AIX_STDINT_5_FIXIDX,
     AIX_SYSMACHINE_FIXIDX,
     AIX_SYSWAIT_2_FIXIDX,
     AIX_VOLATILE_FIXIDX,
@@ -8007,6 +8440,9 @@ typedef enum {
     DARWIN_STDINT_2_FIXIDX,
     DARWIN_STDINT_3_FIXIDX,
     DARWIN_STDINT_4_FIXIDX,
+    DARWIN_STDINT_5_FIXIDX,
+    DARWIN_STDINT_6_FIXIDX,
+    DARWIN_STDINT_7_FIXIDX,
     DEC_INTERN_ASM_FIXIDX,
     DJGPP_WCHAR_H_FIXIDX,
     ECD_CURSOR_FIXIDX,
@@ -8049,10 +8485,9 @@ typedef enum {
     HPUX_C99_INTPTR_FIXIDX,
     HPUX_C99_INTTYPES_FIXIDX,
     HPUX_C99_INTTYPES2_FIXIDX,
-    HPUX_STDINT_LEAST_FIXIDX,
-    HPUX_STDINT_FAST_FIXIDX,
-    HPUX_INTTYPE_INT_LEAST8_T_FIXIDX,
+    HPUX_STDINT_LEAST_FAST_FIXIDX,
     HPUX_INTTYPE_INT8_T_FIXIDX,
+    HPUX_IMAGINARY_I_FIXIDX,
     HUGE_VAL_HEX_FIXIDX,
     HUGE_VALF_HEX_FIXIDX,
     HUGE_VALL_HEX_FIXIDX,
@@ -8064,6 +8499,7 @@ typedef enum {
     IRIX___GENERIC1_FIXIDX,
     IRIX___GENERIC2_FIXIDX,
     IRIX_ASM_APOSTROPHE_FIXIDX,
+    IRIX_COMPLEX_FIXIDX,
     IRIX_LIMITS_CONST_FIXIDX,
     IRIX_SOCKLEN_T_FIXIDX,
     IRIX_STDINT_C99_FIXIDX,
@@ -8104,6 +8540,7 @@ typedef enum {
     RS6000_FCHMOD_FIXIDX,
     RS6000_PARAM_FIXIDX,
     SCO_MATH_FIXIDX,
+    SOLARIS_COMPLEX_FIXIDX,
     SOLARIS_MATH_1_FIXIDX,
     SOLARIS_MATH_2_FIXIDX,
     SOLARIS_MATH_3_FIXIDX,
@@ -8200,11 +8637,41 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
      aAab_Sun_MemcpyTests,   apzAab_Sun_MemcpyPatch, 0 },
 
+  {  zAix_ComplexName,    zAix_ComplexList,
+     apzAix_ComplexMachs,
+     AIX_COMPLEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_ComplexTests,   apzAix_ComplexPatch, 0 },
+
   {  zAix_PthreadName,    zAix_PthreadList,
      apzAix_PthreadMachs,
      AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAix_PthreadTests,   apzAix_PthreadPatch, 0 },
 
+  {  zAix_Stdint_1Name,    zAix_Stdint_1List,
+     apzAix_Stdint_1Machs,
+     AIX_STDINT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_1Tests,   apzAix_Stdint_1Patch, 0 },
+
+  {  zAix_Stdint_2Name,    zAix_Stdint_2List,
+     apzAix_Stdint_2Machs,
+     AIX_STDINT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_2Tests,   apzAix_Stdint_2Patch, 0 },
+
+  {  zAix_Stdint_3Name,    zAix_Stdint_3List,
+     apzAix_Stdint_3Machs,
+     AIX_STDINT_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_3Tests,   apzAix_Stdint_3Patch, 0 },
+
+  {  zAix_Stdint_4Name,    zAix_Stdint_4List,
+     apzAix_Stdint_4Machs,
+     AIX_STDINT_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_4Tests,   apzAix_Stdint_4Patch, 0 },
+
+  {  zAix_Stdint_5Name,    zAix_Stdint_5List,
+     apzAix_Stdint_5Machs,
+     AIX_STDINT_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Stdint_5Tests,   apzAix_Stdint_5Patch, 0 },
+
   {  zAix_SysmachineName,    zAix_SysmachineList,
      apzAix_SysmachineMachs,
      AIX_SYSMACHINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -8390,6 +8857,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      DARWIN_STDINT_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aDarwin_Stdint_4Tests,   apzDarwin_Stdint_4Patch, 0 },
 
+  {  zDarwin_Stdint_5Name,    zDarwin_Stdint_5List,
+     apzDarwin_Stdint_5Machs,
+     DARWIN_STDINT_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Stdint_5Tests,   apzDarwin_Stdint_5Patch, 0 },
+
+  {  zDarwin_Stdint_6Name,    zDarwin_Stdint_6List,
+     apzDarwin_Stdint_6Machs,
+     DARWIN_STDINT_6_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Stdint_6Tests,   apzDarwin_Stdint_6Patch, 0 },
+
+  {  zDarwin_Stdint_7Name,    zDarwin_Stdint_7List,
+     apzDarwin_Stdint_7Machs,
+     DARWIN_STDINT_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aDarwin_Stdint_7Tests,   apzDarwin_Stdint_7Patch, 0 },
+
   {  zDec_Intern_AsmName,    zDec_Intern_AsmList,
      apzDec_Intern_AsmMachs,
      DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
@@ -8600,26 +9082,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX_C99_INTTYPES2_TEST_CT, FD_MACH_ONLY,
      aHpux_C99_Inttypes2Tests,   apzHpux_C99_Inttypes2Patch, 0 },
 
-  {  zHpux_Stdint_LeastName,    zHpux_Stdint_LeastList,
-     apzHpux_Stdint_LeastMachs,
-     HPUX_STDINT_LEAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_Stdint_LeastTests,   apzHpux_Stdint_LeastPatch, 0 },
-
-  {  zHpux_Stdint_FastName,    zHpux_Stdint_FastList,
-     apzHpux_Stdint_FastMachs,
-     HPUX_STDINT_FAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_Stdint_FastTests,   apzHpux_Stdint_FastPatch, 0 },
-
-  {  zHpux_Inttype_Int_Least8_TName,    zHpux_Inttype_Int_Least8_TList,
-     apzHpux_Inttype_Int_Least8_TMachs,
-     HPUX_INTTYPE_INT_LEAST8_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-     aHpux_Inttype_Int_Least8_TTests,   apzHpux_Inttype_Int_Least8_TPatch, 0 },
+  {  zHpux_Stdint_Least_FastName,    zHpux_Stdint_Least_FastList,
+     apzHpux_Stdint_Least_FastMachs,
+     HPUX_STDINT_LEAST_FAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Stdint_Least_FastTests,   apzHpux_Stdint_Least_FastPatch, 0 },
 
   {  zHpux_Inttype_Int8_TName,    zHpux_Inttype_Int8_TList,
      apzHpux_Inttype_Int8_TMachs,
      HPUX_INTTYPE_INT8_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux_Inttype_Int8_TTests,   apzHpux_Inttype_Int8_TPatch, 0 },
 
+  {  zHpux_Imaginary_IName,    zHpux_Imaginary_IList,
+     apzHpux_Imaginary_IMachs,
+     HPUX_IMAGINARY_I_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux_Imaginary_ITests,   apzHpux_Imaginary_IPatch, 0 },
+
   {  zHuge_Val_HexName,    zHuge_Val_HexList,
      apzHuge_Val_HexMachs,
      HUGE_VAL_HEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -8675,6 +9152,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIrix_Asm_ApostropheTests,   apzIrix_Asm_ApostrophePatch, 0 },
 
+  {  zIrix_ComplexName,    zIrix_ComplexList,
+     apzIrix_ComplexMachs,
+     IRIX_COMPLEX_TEST_CT, FD_MACH_ONLY,
+     aIrix_ComplexTests,   apzIrix_ComplexPatch, 0 },
+
   {  zIrix_Limits_ConstName,    zIrix_Limits_ConstList,
      apzIrix_Limits_ConstMachs,
      IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -8875,6 +9357,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SCO_MATH_TEST_CT, FD_MACH_ONLY,
      aSco_MathTests,   apzSco_MathPatch, 0 },
 
+  {  zSolaris_ComplexName,    zSolaris_ComplexList,
+     apzSolaris_ComplexMachs,
+     SOLARIS_COMPLEX_TEST_CT, FD_MACH_ONLY,
+     aSolaris_ComplexTests,   apzSolaris_ComplexPatch, 0 },
+
   {  zSolaris_Math_1Name,    zSolaris_Math_1List,
      apzSolaris_Math_1Machs,
      SOLARIS_MATH_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,