* inclhack.def (aix_net_if_arp): New fix.

[pf3gnuchains/gcc-fork.git] / fixincludes / fixincl.x

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index f1552cc..ac3343d 100644 (file)
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Sunday June 27, 2010 at 12:52:26 PM MEST
+ * It has been AutoGen-ed  Sunday June  5, 2011 at 09:04:54 PM CDT
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jun 27 12:52:26 MEST 2010
+/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jun  5 21:04:54 CDT 2011
  *
  * 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 208 fixup descriptions.
+ * This file contains 211 fixup descriptions.
  *
  * See README for more information.
  *
@@ -522,6 +522,43 @@ static const char* apzAix_ComplexPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Aix_Net_If_Arp fix
+ */
+tSCC zAix_Net_If_ArpName[] =
+     "aix_net_if_arp";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAix_Net_If_ArpList[] =
+  "net/if_arp.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzAix_Net_If_ArpMachs[] = {
+        "*-*-aix*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAix_Net_If_ArpSelect0[] =
+       "^struct  fc_softc \\{";
+
+#define    AIX_NET_IF_ARP_TEST_CT  1
+static tTestDesc aAix_Net_If_ArpTests[] = {
+  { TT_EGREP,    zAix_Net_If_ArpSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Aix_Net_If_Arp
+ */
+static const char* apzAix_Net_If_ArpPatch[] = {
+    "format",
+    "typedef struct _fc_softc {",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Aix_Pthread fix
  */
 tSCC zAix_PthreadName[] =
@@ -3618,7 +3655,7 @@ tSCC zHpux_HtonlList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zHpux_HtonlSelect0[] =
-       "#ifndef _XOPEN_SOURCE_EXTENDED\n\
+       "#ifndef _XOPEN_SOURCE_EXTENDED[ \t]*\n\
 (/\\*\n\
  \\* Macros for number representation conversion\\.\n\
  \\*/\n\
@@ -4665,6 +4702,43 @@ static const char* apzIrix_Limits_ConstPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Irix_Pthread_Init fix
+ */
+tSCC zIrix_Pthread_InitName[] =
+     "irix_pthread_init";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_Pthread_InitList[] =
+  "pthread.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzIrix_Pthread_InitMachs[] = {
+        "mips-sgi-irix6.5",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_Pthread_InitSelect0[] =
+       "^(#define[ \t]+PTHREAD_.*_INITIALIZER[ \t]+)(\\{ 0 \\})";
+
+#define    IRIX_PTHREAD_INIT_TEST_CT  1
+static tTestDesc aIrix_Pthread_InitTests[] = {
+  { TT_EGREP,    zIrix_Pthread_InitSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Irix_Pthread_Init
+ */
+static const char* apzIrix_Pthread_InitPatch[] = {
+    "format",
+    "%1{ %2 }",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Irix_Socklen_T fix
  */
 tSCC zIrix_Socklen_TName[] =
@@ -6219,10 +6293,12 @@ tSCC* apzSolaris_Complex_CxxMachs[] = {
  *  Fix Command Arguments for Solaris_Complex_Cxx
  */
 static const char* apzSolaris_Complex_CxxPatch[] = { sed_cmd_z,
-    "-e", "/#if[ \t]*!defined(__cplusplus)/c#ifdef\t__cplusplus\\\n\
+    "-e", "/#if[ \t]*!defined(__cplusplus)/c\\\n\
+#ifdef\t__cplusplus\\\n\
 extern \"C\" {\\\n\
 #endif",
-    "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c#ifdef\t__cplusplus\\\n\
+    "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c\\\n\
+#ifdef\t__cplusplus\\\n\
 }\\\n\
 #endif",
     (char*)NULL };
@@ -6973,6 +7049,51 @@ static const char* apzSolaris_Stdio_TagPatch[] = { sed_cmd_z,
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Solaris_Sys_Va_List fix
+ */
+tSCC zSolaris_Sys_Va_ListName[] =
+     "solaris_sys_va_list";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSolaris_Sys_Va_ListList[] =
+  "sys/va_list.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzSolaris_Sys_Va_ListMachs[] = {
+        "*-*-solaris2.[89]",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zSolaris_Sys_Va_ListSelect0[] =
+       "#if.*__STDC__.*\n\
+typedef void \\*__va_list;\n\
+#else\n\
+typedef char \\*__va_list;\n\
+#endif";
+
+#define    SOLARIS_SYS_VA_LIST_TEST_CT  1
+static tTestDesc aSolaris_Sys_Va_ListTests[] = {
+  { TT_EGREP,    zSolaris_Sys_Va_ListSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Solaris_Sys_Va_List
+ */
+static const char* apzSolaris_Sys_Va_ListPatch[] = {
+    "format",
+    "#ifdef __GNUC__\n\
+typedef __builtin_va_list __va_list;\n\
+#else\n\
+%0\n\
+#endif",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Statsswtch fix
  */
 tSCC zStatsswtchName[] =
@@ -8470,9 +8591,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          247
+#define REGEX_COUNT          250
 #define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT            208
+#define FIX_COUNT            211
 
 /*
  *  Enumerate the fixes
@@ -8487,6 +8608,7 @@ typedef enum {
     AAB_SOLARIS_SYS_VARARGS_H_FIXIDX,
     AAB_SUN_MEMCPY_FIXIDX,
     AIX_COMPLEX_FIXIDX,
+    AIX_NET_IF_ARP_FIXIDX,
     AIX_PTHREAD_FIXIDX,
     AIX_STDINT_1_FIXIDX,
     AIX_STDINT_2_FIXIDX,
@@ -8591,6 +8713,7 @@ typedef enum {
     IRIX_ASM_APOSTROPHE_FIXIDX,
     IRIX_COMPLEX_FIXIDX,
     IRIX_LIMITS_CONST_FIXIDX,
+    IRIX_PTHREAD_INIT_FIXIDX,
     IRIX_SOCKLEN_T_FIXIDX,
     IRIX_STDINT_C99_MODE_FIXIDX,
     IRIX_STDINT_C99_TYPES_FIXIDX,
@@ -8649,6 +8772,7 @@ typedef enum {
     SOLARIS_INT_LIMITS_3_FIXIDX,
     SOLARIS_INT_TYPES_FIXIDX,
     SOLARIS_STDIO_TAG_FIXIDX,
+    SOLARIS_SYS_VA_LIST_FIXIDX,
     STATSSWTCH_FIXIDX,
     STDIO_STDARG_H_FIXIDX,
     STDIO_VA_LIST_FIXIDX,
@@ -8734,6 +8858,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AIX_COMPLEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAix_ComplexTests,   apzAix_ComplexPatch, 0 },
 
+  {  zAix_Net_If_ArpName,    zAix_Net_If_ArpList,
+     apzAix_Net_If_ArpMachs,
+     AIX_NET_IF_ARP_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAix_Net_If_ArpTests,   apzAix_Net_If_ArpPatch, 0 },
+
   {  zAix_PthreadName,    zAix_PthreadList,
      apzAix_PthreadMachs,
      AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9254,6 +9383,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIrix_Limits_ConstTests,   apzIrix_Limits_ConstPatch, 0 },
 
+  {  zIrix_Pthread_InitName,    zIrix_Pthread_InitList,
+     apzIrix_Pthread_InitMachs,
+     IRIX_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aIrix_Pthread_InitTests,   apzIrix_Pthread_InitPatch, 0 },
+
   {  zIrix_Socklen_TName,    zIrix_Socklen_TList,
      apzIrix_Socklen_TMachs,
      IRIX_SOCKLEN_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -9544,6 +9678,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,
      aSolaris_Stdio_TagTests,   apzSolaris_Stdio_TagPatch, 0 },
 
+  {  zSolaris_Sys_Va_ListName,    zSolaris_Sys_Va_ListList,
+     apzSolaris_Sys_Va_ListMachs,
+     SOLARIS_SYS_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aSolaris_Sys_Va_ListTests,   apzSolaris_Sys_Va_ListPatch, 0 },
+
   {  zStatsswtchName,    zStatsswtchList,
      apzStatsswtchMachs,
      STATSSWTCH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,