diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-19 08:54:32 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-19 08:55:37 -0700 |
commit | aafef7e2951c9f115b18022c72dc7ba5da147caa (patch) | |
tree | 6ffb178276669995d205bdbcaeef46cd6ffe81c4 /bootstrap.conf | |
parent | bed627fd8dc8192da1cf985253ded5ecffd253db (diff) | |
download | grep-aafef7e2951c9f115b18022c72dc7ba5da147caa.tar.gz |
dfa: remove dependency on btowc
MirOS BSD btowc is a macro that (when GCC is being used) hardcodes
btowc (0x80) == WEOF regardless of locale, which contradicts
future POSIX in the C locale. Instead of bothering to develop a
Gnulib workaround for the btowc incompatibility, use mbrtowc,
which we are using elsewhere and fixing anyway, and are caching so
it is fast here. Problem reported by Nelson H. F. Beebe via Jim
Meyering in: http://bugs.gnu.org/23269#14
* bootstrap.conf (gnulib_modules): Remove btowc.
* src/dfa.c (struct dfa): Remove mbrtowc_cache member, replacing with ...
(mbrtowc_cache): ... this new static var. All uses changed.
(dfambcache): Remove; now done by setsyntax. Call removed.
(is_valid_unibyte_character): Remove.
(IS_WORD_CONSTITUENT): Remove this macro, replacing it with ...
(unibyte_word_constituent): ... this new function. It uses
mbrtowc_cache rather than btowc.
(dfasyntax): Initialize mbrtowc_cache before using it.
Diffstat (limited to 'bootstrap.conf')
-rw-r--r-- | bootstrap.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 3bff7c31..9e761314 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -27,7 +27,6 @@ alloca announce-gen argmatch binary-io -btowc c-ctype closeout do-release-commit-and-tag |