inclhack.def (broken_cabs): Make matching more generous.

* fixinc/inclhack.def (broken_cabs): Make matching more generous.
	* fixinc/fixincl.x: Regenerate.
	* fixinc/tests/base/math.h: Regenerate to match test_text change.

From-SVN: r70076
This commit is contained in:
Nathanael Nerode 2003-08-01 22:48:24 +00:00
parent f920765d48
commit 93b8a7a857
3 changed files with 12 additions and 7 deletions

View File

@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
* It has been AutoGen-ed Thursday July 31, 2003 at 07:32:15 PM EDT
* It has been AutoGen-ed Friday August 1, 2003 at 06:47:22 PM EDT
* From the definitions inclhack.def
* and the template file fixincl
*/
/* DO NOT CVS-MERGE THIS FILE, EITHER Thu Jul 31 19:32:15 EDT 2003
/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Aug 1 18:47:22 EDT 2003
*
* You must regenerate it. Use the ./genfixes script.
*
@ -1270,7 +1270,7 @@ tSCC zBroken_CabsName[] =
* File name selection pattern
*/
tSCC zBroken_CabsList[] =
"|math.h|";
"|math.h|architecture/ppc/math.h|architecture/i386/math.h|";
/*
* Machine/OS name selection pattern
*/
@ -1292,7 +1292,7 @@ static tTestDesc aBroken_CabsTests[] = {
static const char* apzBroken_CabsPatch[] = {
"format",
"",
"^extern[ \t]+double[ \t]+cabs\\((struct dbl_hypot|)\\);",
"^extern[ \t]+double[ \t]+cabs[ \t]*\\([^\\)]*\\);",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *

View File

@ -783,21 +783,25 @@ fix = {
* This conflicts with C99. Discovered on AIX.
* SunOS4 has its cabs() declaration followed by a comment which
* terminates on the following line.
* Darwin hides its broken cabs in architecture-specific subdirs.
*/
fix = {
hackname = broken_cabs;
files = "math.h";
select = '^extern[ \t]+double[ \t]+cabs';
files = "math.h";
files = "architecture/ppc/math.h";
files = "architecture/i386/math.h";
select = '^extern[ \t]+double[ \t]+cabs';
c_fix = format;
c_fix_arg = "";
c_fix_arg = "^extern[ \t]+double[ \t]+cabs\\((struct dbl_hypot|)\\);";
c_fix_arg = "^extern[ \t]+double[ \t]+cabs[ \t]*\\([^\\)]*\\);";
test_text = "#ifdef __STDC__\n"
"extern double cabs(struct dbl_hypot);\n"
"#else\n"
"extern double cabs();\n"
"#endif\n"
"extern double cabs ( _Complex z );\n"
"extern double cabs(); /* This is a comment\n"
" and it ends here. */";
};

View File

@ -25,6 +25,7 @@ struct exception;
#else
#endif
/* This is a comment
and it ends here. */
#endif /* BROKEN_CABS_CHECK */