aboutsummaryrefslogtreecommitdiff
path: root/gcc/fixinc
diff options
context:
space:
mode:
authorNathanael Nerode <neroden@gcc.gnu.org>2003-07-09 21:00:01 +0000
committerNathanael Nerode <neroden@gcc.gnu.org>2003-07-09 21:00:01 +0000
commita401fd602dbb3b5953dd6c611296a8b2f013ee5b (patch)
tree34d60524a448568d7245342310f6850b24eca4d0 /gcc/fixinc
parentca1c70118c8611dc8de6347601d6383a498d9eca (diff)
downloadgcc-a401fd602dbb3b5953dd6c611296a8b2f013ee5b.zip
gcc-a401fd602dbb3b5953dd6c611296a8b2f013ee5b.tar.gz
gcc-a401fd602dbb3b5953dd6c611296a8b2f013ee5b.tar.bz2
inclhack.def (math_exception): Improve bypass and comment.
* fixinc/inclhack.def (math_exception): Improve bypass and comment. * fixinc/fixincl.x: Rebuild. From-SVN: r69151
Diffstat (limited to 'gcc/fixinc')
-rw-r--r--gcc/fixinc/fixincl.x6
-rw-r--r--gcc/fixinc/inclhack.def5
2 files changed, 6 insertions, 5 deletions
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index b1a426d..884f1e8 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Tuesday July 8, 2003 at 01:41:54 PM PDT
+ * It has been AutoGen-ed Wednesday July 9, 2003 at 04:58:23 PM EDT
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT CVS-MERGE THIS FILE, EITHER Tue Jul 8 13:41:54 PDT 2003
+/* DO NOT CVS-MERGE THIS FILE, EITHER Wed Jul 9 16:58:23 EDT 2003
*
* You must regenerate it. Use the ./genfixes script.
*
@@ -3022,7 +3022,7 @@ tSCC zMath_ExceptionSelect0[] =
* content bypass pattern - skip fix if pattern found
*/
tSCC zMath_ExceptionBypass0[] =
- "We have a problem when using C\\+\\+";
+ "__cplusplus";
#define MATH_EXCEPTION_TEST_CT 2
static tTestDesc aMath_ExceptionTests[] = {
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index f77c541..dda47b9 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -1680,7 +1680,8 @@ fix = {
/*
- * Some math.h files define struct exception, which conflicts with
+ * Some math.h files define struct exception (it's in the System V
+ * Interface Definition), which conflicts with
* the class exception defined in the C++ file std/stdexcept.h. We
* redefine it to __math_exception. This is not a great fix, but I
* haven't been able to think of anything better.
@@ -1692,7 +1693,7 @@ fix = {
hackname = math_exception;
files = math.h;
select = "struct exception";
- bypass = 'We have a problem when using C\+\+';
+ bypass = '__cplusplus';
c_fix = wrap;
c_fix_arg = "#ifdef __cplusplus\n"