From 3a2e9dd24d9dfc96e966ec77629ba82b777ae5d8 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Mon, 24 Jan 2000 04:53:58 +0000 Subject: [PATCH] fixfixes.c (fix_char_macro_uses): Correct regular expression to allow underscores in macro names. * fixinc/fixfixes.c (fix_char_macro_uses): Correct regular expression to allow underscores in macro names. (fix_char_macro_defines): Increment scanning pointer. From-SVN: r31580 --- gcc/ChangeLog | 6 ++++++ gcc/fixinc/fixfixes.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1d5a61fdb919..3dbfb112cdab 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2000-01-23 Zack Weinberg + + * fixinc/fixfixes.c (fix_char_macro_uses): Correct regular + expression to allow underscores in macro names. + (fix_char_macro_defines): Increment scanning pointer. + 2000-01-23 Richard Henderson * alpha/osf.h (TARGET_HAS_XFLOATING_LIBS): Define. diff --git a/gcc/fixinc/fixfixes.c b/gcc/fixinc/fixfixes.c index 8477589cec6d..597ce383dbcf 100644 --- a/gcc/fixinc/fixfixes.c +++ b/gcc/fixinc/fixfixes.c @@ -378,7 +378,7 @@ fix_char_macro_uses (text, str) /* This regexp looks for a traditional-syntax #define (# in column 1) of an object-like macro. */ static const char pat[] = - "^#[ \t]*define[ \t]+[A-Za-z][A-Za-z0-9]*[ \t]+"; + "^#[ \t]*define[ \t]+[_A-Za-z][_A-Za-z0-9]*[ \t]+"; static regex_t re; regmatch_t rm[1]; @@ -486,6 +486,7 @@ fix_char_macro_defines (text, str) { if (*p == str[0] && !strncmp (p+1, str+1, len-1)) goto found; + p++; } while (isalpha (*p) || isalnum (*p) || *p == '_'); /* Hit end of macro name without finding the string. */ -- 2.43.5