diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-27 01:54:39 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 14:00:34 +0200 |
| commit | 41f937c846d5d106a049094dea67118810d6f4ac (patch) | |
| tree | d1e1064c7e5145326211046d107db446d4c127d7 /libc/misc/regex/regcomp.c | |
| parent | ef304f14b38a40531af4abd5cd4703cb3483be88 (diff) | |
adapt regex to new regex.h
While there, add some defines to help build, cleanup
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libc/misc/regex/regcomp.c')
| -rw-r--r-- | libc/misc/regex/regcomp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c index b25850ccd..b63f115a3 100644 --- a/libc/misc/regex/regcomp.c +++ b/libc/misc/regex/regcomp.c @@ -91,7 +91,7 @@ static reg_errcode_t build_equiv_class (bitset_t sbcset, re_charset_t *mbcset, int *equiv_class_alloc, const unsigned char *name); -static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans, +static reg_errcode_t build_charclass (__RE_TRANSLATE_TYPE trans, bitset_t sbcset, re_charset_t *mbcset, int *char_class_alloc, @@ -100,13 +100,13 @@ static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans, #else /* not RE_ENABLE_I18N */ static reg_errcode_t build_equiv_class (bitset_t sbcset, const unsigned char *name); -static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans, +static reg_errcode_t build_charclass (__RE_TRANSLATE_TYPE trans, bitset_t sbcset, const unsigned char *class_name, reg_syntax_t syntax); #endif /* not RE_ENABLE_I18N */ static bin_tree_t *build_charclass_op (re_dfa_t *dfa, - RE_TRANSLATE_TYPE trans, + __RE_TRANSLATE_TYPE trans, const unsigned char *class_name, const unsigned char *extra, int non_match, reg_errcode_t *err); @@ -3414,11 +3414,11 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name) static reg_errcode_t #ifdef RE_ENABLE_I18N -build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset, +build_charclass (__RE_TRANSLATE_TYPE trans, bitset_t sbcset, re_charset_t *mbcset, int *char_class_alloc, const unsigned char *class_name, reg_syntax_t syntax) #else -build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset, +build_charclass (__RE_TRANSLATE_TYPE trans, bitset_t sbcset, const unsigned char *class_name, reg_syntax_t syntax) #endif { @@ -3496,7 +3496,7 @@ build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset, } static bin_tree_t * -build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans, +build_charclass_op (re_dfa_t *dfa, __RE_TRANSLATE_TYPE trans, const unsigned char *class_name, const unsigned char *extra, int non_match, reg_errcode_t *err) |