From 492d5b4f621dc2e801cbc56d5f5a885149c8b3a9 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 12 Nov 2004 22:26:01 +0000
Subject: [PATCH] inclhack.def (sco_math): Bypass on __GNUG__.

	* inclhack.def (sco_math): Bypass on __GNUG__.
	(sysz_stdlib_for_sun): Bypass on _CLASSIC_ANSI_TYPES.
	* fixincl.x: Regenerate.

From-SVN: r90550
---
 fixincludes/ChangeLog    |  6 ++++++
 fixincludes/fixincl.x    | 24 +++++++++++++++++++-----
 fixincludes/inclhack.def |  2 ++
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 6922cd6cd7e..70ee6e68d55 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-12  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* inclhack.def (sco_math): Bypass on __GNUG__.
+	(sysz_stdlib_for_sun): Bypass on _CLASSIC_ANSI_TYPES.
+	* fixincl.x: Regenerate.
+
 2004-11-09  Joseph S. Myers  <joseph@codesourcery.com>
 
 	* inclhack.def (hpux8_bogus_inlines): Bypass on __GNUG__.
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 95206e36c09..39b281291bc 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Tuesday November  9, 2004 at 11:12:40 PM UTC
+ * It has been AutoGen-ed  Friday November 12, 2004 at 10:24:50 PM UTC
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT CVS-MERGE THIS FILE, EITHER Tue Nov  9 23:12:40 UTC 2004
+/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Nov 12 22:24:50 UTC 2004
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -4472,8 +4472,15 @@ tSCC zSco_MathList[] =
 tSCC zSco_MathSelect0[] =
        "inline double abs";
 
-#define    SCO_MATH_TEST_CT  1
+/*
+ *  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 }, };
 
 /*
@@ -5829,8 +5836,15 @@ tSCC zSysz_Stdlib_For_SunList[] =
 tSCC zSysz_Stdlib_For_SunSelect0[] =
        "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\(";
 
-#define    SYSZ_STDLIB_FOR_SUN_TEST_CT  1
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zSysz_Stdlib_For_SunBypass0[] =
+       "_CLASSIC_ANSI_TYPES";
+
+#define    SYSZ_STDLIB_FOR_SUN_TEST_CT  2
 static tTestDesc aSysz_Stdlib_For_SunTests[] = {
+  { TT_NEGREP,   zSysz_Stdlib_For_SunBypass0, (regex_t*)NULL },
   { TT_EGREP,    zSysz_Stdlib_For_SunSelect0, (regex_t*)NULL }, };
 
 /*
@@ -7233,7 +7247,7 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          211
+#define REGEX_COUNT          213
 #define MACH_LIST_SIZE_LIMIT 261
 #define FIX_COUNT            181
 
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 9dcb1234c29..a36f4d33db9 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -2431,6 +2431,7 @@ fix = {
     files    = ods_30_compat/math.h;
     files    = oldstyle/math.h;
     select   = "inline double abs";
+    bypass   = "__GNUG__";
     sed      = "/#define.*__fp_class(a) \\\\/i\\\n"
 	       "#ifndef __GNUC__\n";
     sed      =
@@ -3519,6 +3520,7 @@ fix = {
 fix = {
     hackname = sysz_stdlib_for_sun;
     files    = stdlib.h;
+    bypass   = "_CLASSIC_ANSI_TYPES";
 
     select    = "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\(";
     c_fix     = format;