inclhack.def (sunos_matherr_decl): Bypass matherr declarations that use `__MATH_EXCEP...

	* fixinc/inclhack.def (sunos_matherr_decl): Bypass matherr
	declarations that use `__MATH_EXCEPTION' in their prototypes, too.
	* fixinc/fixincl.x: Regenerated.

From-SVN: r37402

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d380b7b0fb12e1366af4eb118ff99a3c6d609054..c4060f3bd974701ce3963afc046d906356a77d91 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Sat Nov 11 21:14:02 2000  Mark P Mitchell  <mark@codesourcery.com>
+
+       * fixinc/inclhack.def (sunos_matherr_decl): Bypass matherr
+       declarations that use `__MATH_EXCEPTION' in their prototypes, too.
+       * fixinc/fixincl.x: Regenerated.
+       
 2000-11-11  Bruce Korb  <bkorb@gnu.org>
 
        * fixinc/inclhack.def (avoid_bool_type): avoid commenting out #endif

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 92912600b1d30db3ca707578d9797ec6ed797c6a..ddfe5a5d2267bcdd62cffbe44858c6da12054fa5 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -4021,7 +4021,7 @@ tSCC zSunos_Matherr_DeclSelect0[] =
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zSunos_Matherr_DeclBypass0[] =
-       "matherr.*struct exception";
+       "matherr.*(struct exception|__MATH_EXCEPTION)";
 
 #define    SUNOS_MATHERR_DECL_TEST_CT  2
 static tTestDesc aSunos_Matherr_DeclTests[] = {

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 73b50fd36a7b7e2ddb38a69ab6b2371f7b40dd11..a172593cdc51f596e66e46fa85dfe823a61aa51f 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -2201,7 +2201,7 @@ fix = {
     files     = math.h;
 
     /*  If matherr has a prototype already, the header needs no fix.  */
-    bypass    = 'matherr.*struct exception';
+    bypass    = 'matherr.*(struct exception|__MATH_EXCEPTION)';
     select    = matherr;
 
     c_fix     = wrap;