This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[patch] clean up fixincludes math_exception fix
- From: Nathanael Nerode <neroden at twcny dot rr dot com>
- To: bkorb at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Date: Tue, 8 Jul 2003 16:17:01 -0400
- Subject: [patch] clean up fixincludes math_exception fix
Here's the revised fixincludes fix to prepare for standard
fixincludes on OpenBSD. OK to commit?
(Incidentally, there are a few preexisting 'make check' failures in fixincludes
due to whitespace differences. Want me to fix them?)
* fixinc/inclhack.def (math_exception): Improve bypass and
improve comment.
* fixinc/fixincl.x: Rebuild.
Index: fixincl.x
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fixinc/fixincl.x,v
retrieving revision 1.152
diff -u -r1.152 fixincl.x
--- fixincl.x 2 Jul 2003 01:30:08 -0000 1.152
+++ fixincl.x 8 Jul 2003 20:12:49 -0000
@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Wednesday July 2, 2003 at 03:26:19 AM MEST
+ * It has been AutoGen-ed Tuesday July 8, 2003 at 03:55:56 PM EDT
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT CVS-MERGE THIS FILE, EITHER Wed Jul 2 03:26:20 MEST 2003
+/* DO NOT CVS-MERGE THIS FILE, EITHER Tue Jul 8 15:55:56 EDT 2003
*
* You must regenerate it. Use the ./genfixes script.
*
@@ -3022,7 +3022,7 @@
* 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[] = {
Index: inclhack.def
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fixinc/inclhack.def,v
retrieving revision 1.158
diff -u -r1.158 inclhack.def
--- inclhack.def 2 Jul 2003 01:30:10 -0000 1.158
+++ inclhack.def 8 Jul 2003 20:12:54 -0000
@@ -1680,7 +1680,8 @@
/*
- * 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 @@
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"
--
Nathanael Nerode <neroden at gcc.gnu.org>
http://home.twcny.rr.com/nerode/neroden/fdl.html