inclhack.def (ctrl_quotes_def, [...]): Modify select pattern to also match macro…

inclhack.def (ctrl_quotes_def, [...]): Modify select pattern to also match macro defs with only one argument.

	* fixinc/inclhack.def (ctrl_quotes_def, io_quotes_def): Modify
	select pattern to also match macro defs with only one argument.

From-SVN: r34576

gcc/ChangeLog

+2000-06-16  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* fixinc/inclhack.def (ctrl_quotes_def, io_quotes_def): Modify
+	select pattern to also match macro defs with only one argument.
+
 Thu Jun 15 18:56:12 2000  Jeffrey A Law  (law@cygnus.com)
 
 	* i386.md: Create new [right,left] rotate and right shift

gcc/fixinc/fixincl.x

@@ -1472,7 +1472,7 @@ tSCC zCtrl_Quotes_DefName[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zCtrl_Quotes_DefSelect0[] =
-       "define[ \t]+[A-Z0-9_]+CTRL\\([a-zA-Z],";
+       "define[ \t]+[A-Z0-9_]+CTRL\\([a-zA-Z][,)]";
 
 #define    CTRL_QUOTES_DEF_TEST_CT  1
 tTestDesc aCtrl_Quotes_DefTests[] = {
@@ -1959,7 +1959,7 @@ tSCC zIo_Quotes_DefName[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zIo_Quotes_DefSelect0[] =
-       "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\([a-zA-Z],";
+       "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\([a-zA-Z][,)]";
 
 #define    IO_QUOTES_DEF_TEST_CT  1
 tTestDesc aIo_Quotes_DefTests[] = {

gcc/fixinc/inclhack.def

@@ -888,7 +888,7 @@ fix = {
  */
 fix = {
     hackname  = ctrl_quotes_def;
-    select    = "define[ \t]+[A-Z0-9_]+CTRL\\([a-zA-Z],";
+    select    = "define[ \t]+[A-Z0-9_]+CTRL\\([a-zA-Z][,)]";
     c_fix     = char_macro_def;
     c_fix_arg = "CTRL";
     test_text = "#define BSD43_CTRL(n, x) (('n'<<8)+x)\n"
@@ -1142,7 +1142,7 @@ fix = {
  */
 fix = {
     hackname  = io_quotes_def;
-    select    = "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\([a-zA-Z],";
+    select    = "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\([a-zA-Z][,)]";
     c_fix     = char_macro_def;
     c_fix_arg = "IO";
     test_text =