diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-06-09 02:52:16 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-06-09 02:52:16 +0000 |
| commit | fa55b3b3773e1c7750693cd1571295b578be23a3 (patch) | |
| tree | 973abc08f91e7d0193f8c401c7f10265e6b035fe | |
| parent | 504687d0d2cace41536f255f04ddcee6dfa227a4 (diff) | |
| download | ppe42-gcc-fa55b3b3773e1c7750693cd1571295b578be23a3.tar.gz ppe42-gcc-fa55b3b3773e1c7750693cd1571295b578be23a3.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27434 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 b4f0985c781..ea68aaae582 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 26a5694e925..3cc60141a56 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 85627d0910c..93f620f8214 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 9945d468e0d..a44114d5fca 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" |
