diff options
Diffstat (limited to 'include/ruby/regex.h')
| -rw-r--r-- | include/ruby/regex.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/ruby/regex.h b/include/ruby/regex.h index 118c37c480..ad736775fe 100644 --- a/include/ruby/regex.h +++ b/include/ruby/regex.h @@ -5,7 +5,7 @@ $Author$ $Date$ - Copyright (C) 1993-2005 Yukihiro Matsumoto + Copyright (C) 1993-2007 Yukihiro Matsumoto **********************************************************************/ @@ -29,10 +29,8 @@ extern "C" { ONIG_EXTERN OnigEncoding OnigEncDefaultCharEncoding; -#undef ismbchar -#define ismbchar(c) (mbclen((c)) != 1) -#define mbclen(c) \ - ONIGENC_MBC_ENC_LEN(OnigEncDefaultCharEncoding, (UChar* )(&c)) +#define ismbchar(p, enc) (mbclen((p),(enc)) != 1) +#define mbclen(p,enc) rb_enc_mbclen((p), (enc)) #endif /* ifndef ONIG_RUBY_M17N */ |