diff options
Diffstat (limited to 'fixincludes')
| -rw-r--r-- | fixincludes/ChangeLog | 10 | ||||
| -rw-r--r-- | fixincludes/aclocal.m4 | 2 | ||||
| -rw-r--r-- | fixincludes/fixincl.x | 6 | ||||
| -rw-r--r-- | fixincludes/inclhack.def | 2 |
4 files changed, 15 insertions, 5 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index edcca8af277..ee1087058d4 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,13 @@ +2010-04-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * aclocal.m4: Regenerate. + +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/aclocal.m4 b/fixincludes/aclocal.m4 index e77cebd361c..b23541c34bf 100644 --- a/fixincludes/aclocal.m4 +++ b/fixincludes/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 494b82ff3f5..23407c778d8 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 March 26, 2010 at 07:23:49 AM by AutoGen 5.10 + * It has been AutoGen-ed April 5, 2010 at 07:24:10 PM by AutoGen 5.10 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Mar 26 07:23:49 CET 2010 +/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Apr 5 19:24:10 CEST 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 27ed40934be..910b3889270 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 ' |