diff options
| author | Tomoyuki Sahara <[email protected]> | 2013-03-13 10:22:59 +0900 |
|---|---|---|
| committer | Tomoyuki Sahara <[email protected]> | 2013-03-13 10:22:59 +0900 |
| commit | 00cf5e32a2c28c9fb2163f001638d07c4a8a1a3a (patch) | |
| tree | be7d17382043182fc56655ae36d9b6ce57d1afcc /include | |
| parent | b67fb972f4a2dbc0f799bf71d1ef1c7b959fb3c2 (diff) | |
| parent | c9f3fd477912fa4a822f750fc15df77841828d44 (diff) | |
| download | mruby-00cf5e32a2c28c9fb2163f001638d07c4a8a1a3a.tar.gz mruby-00cf5e32a2c28c9fb2163f001638d07c4a8a1a3a.zip | |
Merge branch 'master' into pr-systemcallerror
Diffstat (limited to 'include')
| -rw-r--r-- | include/mrbconf.h | 4 | ||||
| -rw-r--r-- | include/mruby.h | 1 | ||||
| -rw-r--r-- | include/mruby/string.h | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h index 52490ceba..cabc10b4f 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -46,6 +46,10 @@ /* page size of memory pool */ //#define POOL_PAGE_SIZE 16000 +/* initial minimum size for string buffer */ +//#define MRB_STR_BUF_MIN_SIZE 128 + + /* -DDISABLE_XXXX to drop following features */ //#define DISABLE_STDIO /* use of stdio */ diff --git a/include/mruby.h b/include/mruby.h index cdf78f9ed..e058d409f 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -204,7 +204,6 @@ void *mrb_free(mrb_state*, void*); mrb_value mrb_str_new(mrb_state *mrb, const char *p, int len); /* mrb_str_new */ mrb_value mrb_str_new_cstr(mrb_state*, const char*); -mrb_value mrb_str_new2(mrb_state *mrb, const char *p); mrb_state* mrb_open(void); mrb_state* mrb_open_allocf(mrb_allocf, void *ud); diff --git a/include/mruby/string.h b/include/mruby/string.h index 9e6de485d..2fc748474 100644 --- a/include/mruby/string.h +++ b/include/mruby/string.h @@ -13,8 +13,6 @@ extern "C" { #define IS_EVSTR(p,e) ((p) < (e) && (*(p) == '$' || *(p) == '@' || *(p) == '{')) -#define STR_BUF_MIN_SIZE 128 - extern const char mrb_digitmap[]; typedef struct mrb_shared_string { @@ -55,7 +53,6 @@ mrb_value mrb_str_buf_cat(mrb_state *mrb, mrb_value str, const char *ptr, int le char *mrb_string_value_cstr(mrb_state *mrb, mrb_value *ptr); char *mrb_string_value_ptr(mrb_state *mrb, mrb_value ptr); -int mrb_str_sublen(mrb_state *mrb, mrb_value str, int pos); int mrb_str_offset(mrb_state *mrb, mrb_value str, int pos); mrb_value mrb_str_dup(mrb_state *mrb, mrb_value str); /* mrb_str_dup */ mrb_value mrb_str_intern(mrb_state *mrb, mrb_value self); |