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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b4f0985c781cd7352875990c0d1f9d5f7b7d4a30..ea68aaae582f62f1d41d50fa0c8753246540d7c9 100644 (file)
--- 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 26a5694e925eb6fa01e8351ef6c1bc85e8e8fcbc..3cc60141a566ae9353c5570ca88b1aa2d72997e0 100644 (file)
--- 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 85627d0910c6833ac6cbe174014f87dd4d07501f..93f620f82140d8183317846acc4b373f2c849e09 100644 (file)
--- 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 9945d468e0d7e285a456a1789147bd5b9b366dcb..a44114d5fca3f55261acf89bd436be306a0e35ae 100755 (executable)
--- 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"