OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backport: inclhack.def (alpha_assert): Allow for more whitespace in select. 

Backport from mainline:
	2010-03-31  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* inclhack.def (alpha_assert): Allow for more whitespace in
	select.
	* fixincl.x: Regenerate.

From-SVN: r160167
This commit is contained in:
Rainer Orth 2010-06-02 16:52:51 +00:00 committed by Rainer Orth
parent eb414873e1
commit 6d73b980d5
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fixincludes/ChangeLog
View File

@ -1,3 +1,12 @@
2010-06-02 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Backport from mainline:
2010-03-31 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* inclhack.def (alpha_assert): Allow for more whitespace in
select.
* fixincl.x: Regenerate.
2010-06-02 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Backport from mainline:

6
fixincludes/fixincl.x
View File

@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
* It has been AutoGen-ed Wednesday June 2, 2010 at 06:48:24 PM MEST
* It has been AutoGen-ed Wednesday June 2, 2010 at 06:51:26 PM MEST
* From the definitions inclhack.def
* and the template file fixincl
*/
/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Jun 2 18:48:24 MEST 2010
/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Jun 2 18:51:27 MEST 2010
*
* You must regenerate it. Use the ./genfixes script.
*
@ -832,7 +832,7 @@ tSCC zAlpha_AssertList[] =
* content selection pattern - do fix if pattern found
*/
tSCC zAlpha_AssertSelect0[] =
"(#define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
"(#[ \t]*define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
#define ALPHA_ASSERT_TEST_CT 1
static tTestDesc aAlpha_AssertTests[] = {

2
fixincludes/inclhack.def
View File

@ -509,7 +509,7 @@ fix = {
fix = {
hackname = alpha_assert;
files = "assert.h";
select = '(#define assert\(EX\).*)\(\(int\) \(EX\)\)';
select = "(#[ \t]*" 'define assert\(EX\).*)\(\(int\) \(EX\)\)';
c_fix = format;
c_fix_arg = "%1(EX)";
test_text = '#define assert(EX) (((int) (EX)) ? (void)0 '