From 995c461cce152453f4e161379b82507bec5c4d0c Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Sun, 12 Nov 2000 04:16:07 +0000 Subject: [PATCH] inclhack.def (sunos_matherr_decl): Bypass matherr declarations that use `__MATH_EXCEPTION' in their prototypes, too. * fixinc/inclhack.def (sunos_matherr_decl): Bypass matherr declarations that use `__MATH_EXCEPTION' in their prototypes, too. * fixinc/fixincl.x: Regenerated. From-SVN: r37402 --- gcc/ChangeLog | 6 ++++++ gcc/fixinc/fixincl.x | 2 +- gcc/fixinc/inclhack.def | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d380b7b0fb1..c4060f3bd97 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Sat Nov 11 21:14:02 2000 Mark P Mitchell + + * 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 * fixinc/inclhack.def (avoid_bool_type): avoid commenting out #endif diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 92912600b1d..ddfe5a5d226 100644 --- 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 73b50fd36a7..a172593cdc5 100644 --- 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;