From 7be936ef4acfc58a10bbe0ff9c6ded1e58cdb73b Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 4 Jan 2008 16:30:33 +0000 Subject: * include/ruby/intern.h, re.c (rb_reg_new): keep interface same as 1.8. [ruby-core:14583] * include/ruby/intern.h, re.c (rb_reg_new_str): renamed, and defines HAVE_RB_REG_NEW_STR macro to tell if it is available. * include/ruby/encoding.h (rb_enc_reg_new): added. * insns.def (toregexp), marshal.c (r_object0): use rb_reg_new_str(). * re.c (rb_reg_regcomp, rb_reg_s_union): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/intern.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/ruby/intern.h') diff --git a/include/ruby/intern.h b/include/ruby/intern.h index eaacc9605..9ccba1049 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -454,7 +454,9 @@ VALUE rb_reg_last_match(VALUE); VALUE rb_reg_match_pre(VALUE); VALUE rb_reg_match_post(VALUE); VALUE rb_reg_match_last(VALUE); -VALUE rb_reg_new(VALUE, int); +#define HAVE_RB_REG_NEW_STR 1 +VALUE rb_reg_new_str(VALUE, int); +VALUE rb_reg_new(const char *, long, int); VALUE rb_reg_match(VALUE, VALUE); VALUE rb_reg_match2(VALUE); int rb_reg_options(VALUE); -- cgit