diff options
| author | Paolo Bosetti <[email protected]> | 2012-05-30 22:10:02 -0700 |
|---|---|---|
| committer | Paolo Bosetti <[email protected]> | 2012-05-30 22:10:02 -0700 |
| commit | 6dbba7b799e0cf1a86ec86f347bbc1b40420d372 (patch) | |
| tree | ebbc4d9d1a526833fde0819bcd9a1124be656540 /include | |
| parent | 1da34f46f4ff4ddff8f5c525aab13fdfd7eb4a99 (diff) | |
| parent | fae483ff2a91e806e714cb7d118c7bfb8aadbeb2 (diff) | |
| download | mruby-6dbba7b799e0cf1a86ec86f347bbc1b40420d372.tar.gz mruby-6dbba7b799e0cf1a86ec86f347bbc1b40420d372.zip | |
Merge branch 'master' of git://github.com/mruby/mruby into XCode
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby.h | 1 | ||||
| -rw-r--r-- | include/mruby/string.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/mruby.h b/include/mruby.h index 1c370812e..c86c3b478 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -294,6 +294,7 @@ void mrb_define_class_method(mrb_state *, struct RClass *, const char *, mrb_fun void mrb_define_singleton_method(mrb_state*, struct RObject*, const char*, mrb_func_t,int); void mrb_define_module_function(mrb_state*, struct RClass*, const char*, mrb_func_t,int); void mrb_define_const(mrb_state*, struct RClass*, const char *name, mrb_value); +void mrb_undef_method(mrb_state*, struct RClass*, const char*); mrb_value mrb_instance_new(mrb_state *mrb, mrb_value cv); struct RClass * mrb_class_new(mrb_state *mrb, struct RClass *super); struct RClass * mrb_module_new(mrb_state *mrb); diff --git a/include/mruby/string.h b/include/mruby/string.h index 7050957bd..08dd306e8 100644 --- a/include/mruby/string.h +++ b/include/mruby/string.h @@ -24,9 +24,8 @@ extern "C" { #define mrb_str_new4 mrb_str_new_frozen #define STR_BUF_MIN_SIZE 128 -//#define RSTRING_EMBED_LEN_MAX STR_BUF_MIN_SIZE -extern const char ruby_digitmap[]; +extern const char mrb_digitmap[]; struct RString { MRUBY_OBJECT_HEADER; |