From 1a3a6aec20544743048edbac859180178b1ac20e Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Wed, 31 Mar 2010 09:26:05 +0000
Subject: [PATCH] inclhack.def (alpha_assert): Allow for more whitespace in
select.
* inclhack.def (alpha_assert): Allow for more whitespace in
select.
* fixincl.x: Regenerate.
From-SVN: r157858
---
fixincludes/ChangeLog | 6 ++++++
fixincludes/fixincl.x | 6 +++---
fixincludes/inclhack.def | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index edcca8af2772..84a2b19f4a34 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-31 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * inclhack.def (alpha_assert): Allow for more whitespace in
+ select.
+ * fixincl.x: Regenerate.
+
2010-03-28 H.J. Lu <hongjiu.lu@intel.com>
PR target/40722
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 395b6b49124c..d66766cea2eb 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Wednesday March 24, 2010 at 02:21:16 PM PDT
+ * It has been AutoGen-ed Tuesday March 30, 2010 at 09:51:20 PM MEST
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Mar 24 14:21:16 PDT 2010
+/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Mar 30 21:51:20 MEST 2010
*
* You must regenerate it. Use the ./genfixes script.
*
@@ -1043,7 +1043,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[] = {
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 27ed40934be3..910b3889270a 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -607,7 +607,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 '
--
GitLab