diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fixinc/check.diff | 67 | ||||
| -rw-r--r-- | gcc/fixinc/fixfixes.c | 2 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.tpl | 2 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 160 | ||||
| -rwxr-xr-x | gcc/fixinc/genfixes | 2 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 44 |
7 files changed, 184 insertions, 99 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a8cdab98426..09153542dc4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -86,6 +86,12 @@ Fri May 12 19:03:58 2000 Philippe De Muyter <phdm@macqel.be> 2000-05-12 Bruce Korb <bkorb@gnu.org> * fixinc/fixfixes.c(format_write): buglet & relaxed rules + * fixinc/check.diff: updated + * fixinc/inclhack.def: corrected & added some test_text-s + * fixinc/genfixes: removed unneeded options to autogen invocation + * fixinc/fixincl.tpl: Specified the output file + * fixinc/fixfixes.c: visual appearance + * fixinc/fixincl.x: regenerate 2000-05-12 Zack Weinberg <zack@wolery.cumb.org> diff --git a/gcc/fixinc/check.diff b/gcc/fixinc/check.diff index c76c32f81ac..da0496e57e0 100644 --- a/gcc/fixinc/check.diff +++ b/gcc/fixinc/check.diff @@ -88,7 +88,7 @@ --- 1,7 ---- + #ifdef __cplusplus + #include <stdlib.h> -+ #endif ++ #endif /* BROKEN_ASSERT_STDLIB_CHECK fix stamp */ + #include <stdio.h> @@ -156,7 +156,7 @@ *** inc/stdio.h --- res/stdio.h *************** -*** 1,7 **** +*** 1,12 **** #ifndef ALPHA_GETOPT_CHECK @@ -164,7 +164,12 @@ #endif /* ALPHA_GETOPT_CHECK */ ---- 1,9 ---- + #ifndef ISC_OMITS_WITH_STDC_CHECK +! #if !defined(__STDC__) && !defined(_POSIX_SOURCE) /* ? ! */ + int foo; + #endif + #endif /* ISC_OMITS_WITH_STDC_CHECK */ +--- 1,14 ---- + #define __need___va_list + #include <stdarg.h> @@ -174,6 +179,11 @@ #endif /* ALPHA_GETOPT_CHECK */ + #ifndef ISC_OMITS_WITH_STDC_CHECK +! #if !defined(_POSIX_SOURCE) /* ? ! */ + int foo; + #endif + #endif /* ISC_OMITS_WITH_STDC_CHECK */ *** inc/stdlib.h --- res/stdlib.h *************** @@ -246,6 +256,38 @@ extern int foo; #endif #endif /* ALPHA_PARENS_CHECK */ +*** inc/sys/file.h +--- res/sys/file.h +*************** +*** 1,5 **** + + + #ifndef HP_SYSFILE_CHECK +! extern void foo(...); /* HPUX_SOURCE - bad varargs */ + #endif /* HP_SYSFILE_CHECK */ +--- 1,5 ---- + + + #ifndef HP_SYSFILE_CHECK +! extern void foo(struct file *, ...); /* HPUX_SOURCE - bad varargs */ + #endif /* HP_SYSFILE_CHECK */ +*** inc/sys/mman.h +--- res/sys/mman.h +*************** +*** 1,5 **** +--- 1,12 ---- ++ #ifdef __cplusplus ++ extern "C" { ++ #endif /* CXX_UNREADY_CHECK */ ++ + + + #ifndef CXX_UNREADY_CHECK + extern void* malloc( size_t ); + #endif /* CXX_UNREADY_CHECK */ ++ #ifdef __cplusplus ++ } ++ #endif /* CXX_UNREADY_CHECK */ *** inc/sys/param.h --- res/sys/param.h *************** @@ -290,6 +332,25 @@ #ifndef AIX_VOLATILE_CHECK ! typedef int sig_atomic_t; #endif /* AIX_VOLATILE_CHECK */ +*** inc/sys/spinlock.h +--- res/sys/spinlock.h +*************** +*** 1,7 **** + + + #ifndef HP_INLINE_CHECK +! # include "../machine/inline.h" + # include "../machine/dontfix.h" +! # include "../machine/psl.h" + #endif /* HP_INLINE_CHECK */ +--- 1,7 ---- + + + #ifndef HP_INLINE_CHECK +! # include <machine/inline.h> + # include "../machine/dontfix.h" +! # include <machine/psl.h> + #endif /* HP_INLINE_CHECK */ *** inc/sys/time.h --- res/sys/time.h *************** diff --git a/gcc/fixinc/fixfixes.c b/gcc/fixinc/fixfixes.c index 90b8fd814ab..d254a70fe8f 100644 --- a/gcc/fixinc/fixfixes.c +++ b/gcc/fixinc/fixfixes.c @@ -69,7 +69,7 @@ typedef struct { _FT_( "format", format_fix ) \ _FT_( "char_macro_use", char_macro_use_fix ) \ _FT_( "char_macro_def", char_macro_def_fix ) \ - _FT_( "machine_name", machine_name_fix ) + _FT_( "machine_name", machine_name_fix ) #define FIX_PROC_HEAD( fix ) \ diff --git a/gcc/fixinc/fixincl.tpl b/gcc/fixinc/fixincl.tpl index fc5a4421dcd..a68dec85cac 100644 --- a/gcc/fixinc/fixincl.tpl +++ b/gcc/fixinc/fixincl.tpl @@ -1,5 +1,5 @@ [= autogen template -*- Mode: C -*- -x =] +x=fixincl.x =] /* * DO NOT EDIT THIS FILE - it has been generated * diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 184d7d24753..719fab4739d 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -754,18 +754,22 @@ tSCC zAix_SyswaitList[] = * content selection pattern - do fix if pattern found */ tSCC zAix_SyswaitSelect0[] = + "^extern pid_t wait3\\(\\);\n"; +tSCC zAix_SyswaitSelect1[] = "bos325,"; -#define AIX_SYSWAIT_TEST_CT 1 +#define AIX_SYSWAIT_TEST_CT 2 tTestDesc aAix_SyswaitTests[] = { - { TT_EGREP, zAix_SyswaitSelect0, (regex_t*)NULL }, }; + { TT_EGREP, zAix_SyswaitSelect0, (regex_t*)NULL }, + { TT_EGREP, zAix_SyswaitSelect1, (regex_t*)NULL }, }; /* * Fix Command Arguments for Aix_Syswait */ -const char* apzAix_SyswaitPatch[] = { "sed", - "-e", "/^extern pid_t wait3();$/i\\\n\ -struct rusage;\n", +const char* apzAix_SyswaitPatch[] = { + "format", + "struct rusage;\n\ +%0", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -1257,7 +1261,7 @@ const char* apzBroken_Assert_StdlibPatch[] = { "sed", "-e", "1i\\\n\ #ifdef __cplusplus\\\n\ #include <stdlib.h>\\\n\ -#endif\n", +#endif /* BROKEN_ASSERT_STDLIB_CHECK fix stamp */\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -1466,12 +1470,12 @@ const char* apzCxx_UnreadyPatch[] = { "sed", "-e", "1i\\\n\ #ifdef __cplusplus\\\n\ extern \"C\" {\\\n\ -#endif\\\n\ +#endif /* CXX_UNREADY_CHECK */\\\n\ \n", "-e", "$a\\\n\ #ifdef __cplusplus\\\n\ }\\\n\ -#endif\n", +#endif /* CXX_UNREADY_CHECK */\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -1642,7 +1646,7 @@ tSCC zIsc_Omits_With_StdcList[] = * content selection pattern - do fix if pattern found */ tSCC zIsc_Omits_With_StdcSelect0[] = - "!defined(__STDC__) && !defined(_POSIX_SOURCE)"; + "!defined\\(__STDC__\\) && !defined\\(_POSIX_SOURCE\\)"; #define ISC_OMITS_WITH_STDC_TEST_CT 1 tTestDesc aIsc_Omits_With_StdcTests[] = { @@ -1657,140 +1661,140 @@ const char* apzIsc_Omits_With_StdcPatch[] = { "sed", /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Io_Use_Quotes fix + * Description of Io_Quotes_Use fix */ -#define IO_USE_QUOTES_FIXIDX 38 -tSCC zIo_Use_QuotesName[] = - "io_use_quotes"; +#define IO_QUOTES_USE_FIXIDX 38 +tSCC zIo_Quotes_UseName[] = + "io_quotes_use"; /* * File name selection pattern */ -#define zIo_Use_QuotesList (char*)NULL +#define zIo_Quotes_UseList (char*)NULL /* * Machine/OS name selection pattern */ -#define apzIo_Use_QuotesMachs (const char**)NULL +#define apzIo_Quotes_UseMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zIo_Use_QuotesSelect0[] = +tSCC zIo_Quotes_UseSelect0[] = "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+IO[A-Z]*[ \t]*\\( *[^,']"; -#define IO_USE_QUOTES_TEST_CT 1 -tTestDesc aIo_Use_QuotesTests[] = { - { TT_EGREP, zIo_Use_QuotesSelect0, (regex_t*)NULL }, }; +#define IO_QUOTES_USE_TEST_CT 1 +tTestDesc aIo_Quotes_UseTests[] = { + { TT_EGREP, zIo_Quotes_UseSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Io_Use_Quotes + * Fix Command Arguments for Io_Quotes_Use */ -const char* apzIo_Use_QuotesPatch[] = { +const char* apzIo_Quotes_UsePatch[] = { "char_macro_use", "IO", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Io_Def_Quotes fix + * Description of Io_Quotes_Def fix */ -#define IO_DEF_QUOTES_FIXIDX 39 -tSCC zIo_Def_QuotesName[] = - "io_def_quotes"; +#define IO_QUOTES_DEF_FIXIDX 39 +tSCC zIo_Quotes_DefName[] = + "io_quotes_def"; /* * File name selection pattern */ -#define zIo_Def_QuotesList (char*)NULL +#define zIo_Quotes_DefList (char*)NULL /* * Machine/OS name selection pattern */ -#define apzIo_Def_QuotesMachs (const char**)NULL +#define apzIo_Quotes_DefMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zIo_Def_QuotesSelect0[] = +tSCC zIo_Quotes_DefSelect0[] = "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\(([a-zA-Z]).*'\\1'"; -#define IO_DEF_QUOTES_TEST_CT 1 -tTestDesc aIo_Def_QuotesTests[] = { - { TT_EGREP, zIo_Def_QuotesSelect0, (regex_t*)NULL }, }; +#define IO_QUOTES_DEF_TEST_CT 1 +tTestDesc aIo_Quotes_DefTests[] = { + { TT_EGREP, zIo_Quotes_DefSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Io_Def_Quotes + * Fix Command Arguments for Io_Quotes_Def */ -const char* apzIo_Def_QuotesPatch[] = { +const char* apzIo_Quotes_DefPatch[] = { "char_macro_def", "IO", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ctrl_Use_Quotes fix + * Description of Ctrl_Quotes_Use fix */ -#define CTRL_USE_QUOTES_FIXIDX 40 -tSCC zCtrl_Use_QuotesName[] = - "ctrl_use_quotes"; +#define CTRL_QUOTES_USE_FIXIDX 40 +tSCC zCtrl_Quotes_UseName[] = + "ctrl_quotes_use"; /* * File name selection pattern */ -#define zCtrl_Use_QuotesList (char*)NULL +#define zCtrl_Quotes_UseList (char*)NULL /* * Machine/OS name selection pattern */ -#define apzCtrl_Use_QuotesMachs (const char**)NULL +#define apzCtrl_Quotes_UseMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zCtrl_Use_QuotesSelect0[] = +tSCC zCtrl_Quotes_UseSelect0[] = "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+CTRL[ \t]*\\( *[^,']"; -#define CTRL_USE_QUOTES_TEST_CT 1 -tTestDesc aCtrl_Use_QuotesTests[] = { - { TT_EGREP, zCtrl_Use_QuotesSelect0, (regex_t*)NULL }, }; +#define CTRL_QUOTES_USE_TEST_CT 1 +tTestDesc aCtrl_Quotes_UseTests[] = { + { TT_EGREP, zCtrl_Quotes_UseSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ctrl_Use_Quotes + * Fix Command Arguments for Ctrl_Quotes_Use */ -const char* apzCtrl_Use_QuotesPatch[] = { +const char* apzCtrl_Quotes_UsePatch[] = { "char_macro_use", "CTRL", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Ctrl_Def_Quotes fix + * Description of Ctrl_Quotes_Def fix */ -#define CTRL_DEF_QUOTES_FIXIDX 41 -tSCC zCtrl_Def_QuotesName[] = - "ctrl_def_quotes"; +#define CTRL_QUOTES_DEF_FIXIDX 41 +tSCC zCtrl_Quotes_DefName[] = + "ctrl_quotes_def"; /* * File name selection pattern */ -#define zCtrl_Def_QuotesList (char*)NULL +#define zCtrl_Quotes_DefList (char*)NULL /* * Machine/OS name selection pattern */ -#define apzCtrl_Def_QuotesMachs (const char**)NULL +#define apzCtrl_Quotes_DefMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zCtrl_Def_QuotesSelect0[] = +tSCC zCtrl_Quotes_DefSelect0[] = "define[ \t]+[A-Z0-9_]+CTRL\\(([a-zA-Z]).*'\\1'"; -#define CTRL_DEF_QUOTES_TEST_CT 1 -tTestDesc aCtrl_Def_QuotesTests[] = { - { TT_EGREP, zCtrl_Def_QuotesSelect0, (regex_t*)NULL }, }; +#define CTRL_QUOTES_DEF_TEST_CT 1 +tTestDesc aCtrl_Quotes_DefTests[] = { + { TT_EGREP, zCtrl_Quotes_DefSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Ctrl_Def_Quotes + * Fix Command Arguments for Ctrl_Quotes_Def */ -const char* apzCtrl_Def_QuotesPatch[] = { +const char* apzCtrl_Quotes_DefPatch[] = { "char_macro_def", "CTRL", (char*)NULL }; @@ -4685,7 +4689,7 @@ extern char *\tsprintf();\\\n\ * * List of all fixes */ -#define REGEX_COUNT 104 +#define REGEX_COUNT 105 #define MACH_LIST_SIZE_LIMIT 279 #define FIX_COUNT 118 @@ -4757,7 +4761,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = { { zAix_SyswaitName, zAix_SyswaitList, apzAix_SyswaitMachs, - AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY, + AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAix_SyswaitTests, apzAix_SyswaitPatch }, { zAix_VolatileName, zAix_VolatileList, @@ -4880,25 +4884,25 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ISC_OMITS_WITH_STDC_TEST_CT, FD_MACH_ONLY, aIsc_Omits_With_StdcTests, apzIsc_Omits_With_StdcPatch }, - { zIo_Use_QuotesName, zIo_Use_QuotesList, - apzIo_Use_QuotesMachs, - IO_USE_QUOTES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aIo_Use_QuotesTests, apzIo_Use_QuotesPatch }, - - { zIo_Def_QuotesName, zIo_Def_QuotesList, - apzIo_Def_QuotesMachs, - IO_DEF_QUOTES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aIo_Def_QuotesTests, apzIo_Def_QuotesPatch }, - - { zCtrl_Use_QuotesName, zCtrl_Use_QuotesList, - apzCtrl_Use_QuotesMachs, - CTRL_USE_QUOTES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aCtrl_Use_QuotesTests, apzCtrl_Use_QuotesPatch }, - - { zCtrl_Def_QuotesName, zCtrl_Def_QuotesList, - apzCtrl_Def_QuotesMachs, - CTRL_DEF_QUOTES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aCtrl_Def_QuotesTests, apzCtrl_Def_QuotesPatch }, + { zIo_Quotes_UseName, zIo_Quotes_UseList, + apzIo_Quotes_UseMachs, + IO_QUOTES_USE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aIo_Quotes_UseTests, apzIo_Quotes_UsePatch }, + + { zIo_Quotes_DefName, zIo_Quotes_DefList, + apzIo_Quotes_DefMachs, + IO_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aIo_Quotes_DefTests, apzIo_Quotes_DefPatch }, + + { zCtrl_Quotes_UseName, zCtrl_Quotes_UseList, + apzCtrl_Quotes_UseMachs, + CTRL_QUOTES_USE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aCtrl_Quotes_UseTests, apzCtrl_Quotes_UsePatch }, + + { zCtrl_Quotes_DefName, zCtrl_Quotes_DefList, + apzCtrl_Quotes_DefMachs, + CTRL_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aCtrl_Quotes_DefTests, apzCtrl_Quotes_DefPatch }, { zIp_Missing_SemiName, zIp_Missing_SemiList, apzIp_Missing_SemiMachs, diff --git a/gcc/fixinc/genfixes b/gcc/fixinc/genfixes index 2a4f6cc3208..27fecd41c03 100755 --- a/gcc/fixinc/genfixes +++ b/gcc/fixinc/genfixes @@ -71,7 +71,7 @@ fixincl.x | */fixincl.x ) if (${AG} --help > /dev/null 2>&1) then echo AutoGen-ing fixincl.x - $AG -T fixincl.tpl -b fixincl inclhack.def + $AG inclhack.def else echo "AutoGen does not appear to be correctly installed." echo "Please download and install:" diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index fd282c851f3..58b0b01958e 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -523,9 +523,10 @@ fix = { fix = { hackname = aix_syswait; files = sys/wait.h; + select = "^extern pid_t wait3\\(\\);\n"; select = "bos325,"; - sed = "/^extern pid_t wait3();$/i\\\n" - "struct rusage;\n"; + c_fix = format; + c_fix_arg = "struct rusage;\n%0"; test_text = "/* bos325, */\nextern pid_t wait3();"; }; @@ -768,7 +769,7 @@ fix = { sed = "1i\\\n" "#ifdef __cplusplus\\\n" "#include <stdlib.h>\\\n" - "#endif\n"; + "#endif /* BROKEN_ASSERT_STDLIB_CHECK fix stamp */\n"; test_text = "extern void exit ( int );"; }; @@ -831,7 +832,9 @@ fix = { select = 'include.*"\.\./machine/'; sed = "s,\"../machine/inline.h\",<machine/inline.h>,"; sed = "s,\"../machine/psl.h\",<machine/psl.h>,"; - test_text = '# include "../machine/fumble.h"'; + test_text = '# include "../machine/inline.h"' "\n" + '# include "../machine/dontfix.h"' "\n" + '# include "../machine/psl.h"'; }; @@ -842,8 +845,8 @@ fix = { hackname = hp_sysfile; files = sys/file.h; select = "HPUX_SOURCE"; - sed = 's/(\.\.\.)/(struct file *, ...)/'; - test_text = "extern void foo(...); /* bad varargs */"; + sed = 's/(\.\.\.)/(struct file *, ...)/'; + test_text = "extern void foo(...); /* HPUX_SOURCE - bad varargs */"; }; @@ -865,11 +868,12 @@ fix = { sed = "1i\\\n" "#ifdef __cplusplus\\\n" "extern \"C\" {\\\n" - "#endif\\\n\n"; + "#endif /* CXX_UNREADY_CHECK */\\\n\n"; sed = "$a\\\n" "#ifdef __cplusplus\\\n" "}\\\n" - "#endif\n"; + "#endif /* CXX_UNREADY_CHECK */\n"; + test_text = "extern void* malloc( size_t );"; }; @@ -956,7 +960,7 @@ fix = { files = "sys/fcntl.h"; files = "sys/dirent.h"; - select = "!defined\(__STDC__\) && !defined\(_POSIX_SOURCE\)"; + select = '!defined\(__STDC__\) && !defined\(_POSIX_SOURCE\)'; sed = "s/!defined(__STDC__) && !defined(_POSIX_SOURCE)/" "!defined(_POSIX_SOURCE)/"; @@ -978,14 +982,15 @@ fix = { * _IO might be: _IO DESIO BSD43__IO with W, R, WR, C, ... suffixes. */ fix = { - hackname = io_use_quotes; - select = "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+IO[A-Z]*[ \t]*\\( *[^,']"; + hackname = io_quotes_use; + select = "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+IO[A-Z]*[ \t]*" + "\\( *[^,']"; c_fix = char_macro_use; c_fix_arg = "IO"; }; fix = { - hackname = io_def_quotes; + hackname = io_quotes_def; select = "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\(([a-zA-Z]).*'\\1'"; c_fix = char_macro_def; c_fix_arg = "IO"; @@ -993,18 +998,27 @@ fix = { /* - * Same deal for CTRL() macros. + * Fix various macros used to define ioctl numbers. The traditional + * syntax was + * #define _CTRL(n, x) (('n'<<8)+x) + * #define TIOCFOO _CTRL(T, 1) + * but this does not work with the C standard, which disallows macro + * expansion inside strings. We have to rewrite it thus: + * #define _CTRL(n, x) ((n<<8)+x) + * #define TIOCFOO _CTRL('T', 1) + * The select expressions match too much, but the c_fix code is cautious. + * * CTRL might be: CTRL _CTRL ISCTRL BSD43_CTRL ... */ fix = { - hackname = ctrl_use_quotes; + hackname = ctrl_quotes_use; select = "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+CTRL[ \t]*\\( *[^,']"; c_fix = char_macro_use; c_fix_arg = "CTRL"; }; fix = { - hackname = ctrl_def_quotes; + hackname = ctrl_quotes_def; select = "define[ \t]+[A-Z0-9_]+CTRL\\(([a-zA-Z]).*'\\1'"; c_fix = char_macro_def; c_fix_arg = "CTRL"; |