1 files changed, 65 insertions, 0 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index fa05d88eedf..572637e8454 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,19 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
+<<<<<<< .mine
+ * It has been AutoGen-ed  September  5, 2009 at 01:31:09 PM by AutoGen 5.9.9
+=======
  * It has been AutoGen-ed  Friday January 29, 2010 at 04:49:43 PM MET
+>>>>>>> .r157397
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
+<<<<<<< .mine
+/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Sep  5 13:31:09 PDT 2009
+=======
 /* DO NOT SVN-MERGE THIS FILE, EITHER Fri Jan 29 16:49:43 MET 2010
+>>>>>>> .r157397
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -6114,6 +6122,63 @@ static const char* apzRs6000_ParamPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+<<<<<<< .mine
+ *  Description of Sco_Math fix
+ */
+tSCC zSco_MathName[] =
+     "sco_math";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zSco_MathList[] =
+  "math.h\0*/math.h\0";
+/*
+ *  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";
+
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSco_MathBypass0[] =
+       "__GNUG__";
+
+#define    SCO_MATH_TEST_CT  2
+static tTestDesc aSco_MathTests[] = {
+  { TT_NEGREP,   zSco_MathBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zSco_MathSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Sco_Math
+ */
+static const char* apzSco_MathPatch[] = { sed_cmd_z,
+    "-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\n",
+    "-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__ */\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+=======
+>>>>>>> .r157397
  *  Description of Solaris_Complex fix
  */
 tSCC zSolaris_ComplexName[] =