diff options
author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 1999-06-09 02:52:16 +0000 |
---|---|---|
committer | Jeff Law <law@gcc.gnu.org> | 1999-06-08 20:52:16 -0600 |
commit | b75b4e92c8a5599410d1f26d4333fce600f7d7fd (patch) | |
tree | 973abc08f91e7d0193f8c401c7f10265e6b035fe | |
parent | 3cc0b5517abf97ac8b44adcfeca642410d99b441 (diff) | |
download | gcc-b75b4e92c8a5599410d1f26d4333fce600f7d7fd.zip gcc-b75b4e92c8a5599410d1f26d4333fce600f7d7fd.tar.gz gcc-b75b4e92c8a5599410d1f26d4333fce600f7d7fd.tar.bz2 |
inclhack.def (sun_catmacro): Escape parens in the select pattern.
1999-06-09 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* fixinc/inclhack.def (sun_catmacro): Escape parens in the select
pattern.
* fixinc/fixincl.x, fixinc/inclhack.sh: Rebuilt.
From-SVN: r27434
-rw-r--r-- | gcc/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/fixinc/fixincl.x | 2 | ||||
-rw-r--r-- | gcc/fixinc/inclhack.def | 2 | ||||
-rwxr-xr-x | gcc/fixinc/inclhack.sh | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b4f0985..ea68aaa 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +1999-06-09 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * fixinc/inclhack.def (sun_catmacro): Escape parens in the select + pattern. + * fixinc/fixincl.x, fixinc/inclhack.sh: Rebuilt. + Wed Jun 9 03:10:34 1999 Mumit Khan <khan@xraylith.wisc.edu> * c-pragma.c (handle_pragma_token): Handle `#pragma pack()' diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 26a5694..3cc6014 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -2422,7 +2422,7 @@ tSCC zSun_CatmacroList[] = * content selection pattern - do fix if pattern found */ tSCC zSun_CatmacroSelect0[] = - "^#define[ \t]+CAT(a,b)"; + "^#define[ \t]+CAT\\(a,b\\)"; #define SUN_CATMACRO_TEST_CT 1 #define SUN_CATMACRO_RE_CT 1 diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 85627d0..93f620f 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -1403,7 +1403,7 @@ fix = { fix = { hackname = sun_catmacro; files = pixrect/memvar.h; - select = "^#define[ \t]+CAT(a,b)"; + select = "^#define[ \t]+CAT\\(a,b\\)"; sed = "/^#define[ \t]CAT(a,b)/ i\\\n" "#ifdef __STDC__ \\\n" "#define CAT(a,b) a##b\\\n" diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh index 9945d46..a44114d 100755 --- a/gcc/fixinc/inclhack.sh +++ b/gcc/fixinc/inclhack.sh @@ -2022,7 +2022,7 @@ typedef __regmatch_t regmatch_t; # Fix 67: Sun_Catmacro # case "${file}" in ./pixrect/memvar.h ) - if ( test -n "`egrep '^#define[ ]+CAT(a,b)' ${file}`" + if ( test -n "`egrep '^#define[ ]+CAT\\(a,b\\)' ${file}`" ) > /dev/null 2>&1 ; then fixlist="${fixlist} sun_catmacro" |