diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2010-02-04 15:35:49 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2010-02-04 15:35:49 +0300 |
| commit | e1e595a649d55a304416c1e8e23f99e0df58a452 (patch) | |
| tree | cb83b739abde54551467f2b187416820bd25d54f /winsup/cygwin/nlsfuncs.cc | |
| parent | c8f7d3cb48efbcdeed082c16a6d5b90ae3c75791 (diff) | |
Replace regex files with multibyte-aware version from FreeBSD.
* Makefile.in (install-headers): Remove extra command to install
regex.h.
(uninstall-headers): Remove extra command to uninstall regex.h.
* nlsfuncs.cc (collate_lcid): Make externally available to allow
access to collation internals from regex functions.
(collate_charset): Ditto.
* wchar.h: Add __cplusplus guards to make C-clean.
* include/regex.h: New file, replacing regex/regex.h. Remove UCB
advertising clause.
* regex/COPYRIGHT: Accommodate BSD license. Remove UCB advertising
clause.
* regex/cclass.h: Remove.
* regex/cname.h: New file from FreeBSD.
* regex/engine.c: Ditto.
(NONCHAR): Tweak for Cygwin.
* regex/engine.ih: Remove.
* regex/mkh: Remove.
* regex/regcomp.c: New file from FreeBSD. Tweak slightly for Cygwin.
Import required collate internals from nlsfunc.cc.
(p_ere_exp): Add GNU-specific \< and \> handling for word boundaries.
(p_simp_re): Ditto.
(__collate_range_cmp): Define.
(p_b_term): Use Cygwin-specific collate internals.
(findmust): Ditto.
* regex/regcomp.ih: Remove.
* regex/regerror.c: New file from FreeBSD. Fix a few compiler warnings.
* regex/regerror.ih: Remove.
* regex/regex.7: New file from FreeBSD. Remove UCB advertising clause.
* regex/regex.h: Remove. Replaced by include/regex.h.
* regex/regexec.c: New file from FreeBSD. Fix a few compiler warnings.
* regex/regfree.c: New file from FreeBSD.
* regex/tests: Remove.
* regex/utils.h: New file from FreeBSD.
Diffstat (limited to 'winsup/cygwin/nlsfuncs.cc')
| -rw-r--r-- | winsup/cygwin/nlsfuncs.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/nlsfuncs.cc b/winsup/cygwin/nlsfuncs.cc index f8892533b..3310fb752 100644 --- a/winsup/cygwin/nlsfuncs.cc +++ b/winsup/cygwin/nlsfuncs.cc @@ -638,9 +638,9 @@ __set_lc_monetary_from_win (const char *name, return 1; } -static LCID collate_lcid = 0; +LCID collate_lcid = 0; static mbtowc_p collate_mbtowc = __ascii_mbtowc; -static char collate_charset[ENCODING_LEN + 1] = "ASCII"; +char collate_charset[ENCODING_LEN + 1] = "ASCII"; /* Called from newlib's setlocale() if category is LC_COLLATE. Stores LC_COLLATE locale information. This is subsequently accessed by the |