diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-05-31 15:32:38 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-05-31 15:32:38 +0900 |
| commit | 64fc4ac332eab0be7704cf6f7ec5a96c523c0ed9 (patch) | |
| tree | 00bca09773b7584fd2b56c371fe6159550c38b6f /src/object.c | |
| parent | 0d8adaaaa16859342a37e3bf6832a8717c54f27c (diff) | |
| download | mruby-64fc4ac332eab0be7704cf6f7ec5a96c523c0ed9.tar.gz mruby-64fc4ac332eab0be7704cf6f7ec5a96c523c0ed9.zip | |
resolve conflict
Diffstat (limited to 'src/object.c')
| -rw-r--r-- | src/object.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/object.c b/src/object.c index 1d84909ec..4dc900feb 100644 --- a/src/object.c +++ b/src/object.c @@ -11,13 +11,6 @@ #include "mruby/class.h" #include "mruby/numeric.h" -#ifdef INCLUDE_REGEXP - #define mrb_usascii_str_new2 mrb_usascii_str_new_cstr -#else - #define mrb_usascii_str_new2 mrb_str_new_cstr - #define mrb_usascii_str_new mrb_str_new -#endif - #ifndef FALSE #define FALSE 0 #endif @@ -106,7 +99,7 @@ mrb_true(mrb_state *mrb, mrb_value obj) static mrb_value nil_to_s(mrb_state *mrb, mrb_value obj) { - return mrb_usascii_str_new(mrb, 0, 0); + return mrb_str_new(mrb, 0, 0); } /*********************************************************************** @@ -166,7 +159,7 @@ true_xor(mrb_state *mrb, mrb_value obj) static mrb_value true_to_s(mrb_state *mrb, mrb_value obj) { - return mrb_usascii_str_new2(mrb, "true"); + return mrb_str_new_cstr(mrb, "true"); } /* 15.2.5.3.4 */ @@ -279,7 +272,7 @@ false_or(mrb_state *mrb, mrb_value obj) static mrb_value false_to_s(mrb_state *mrb, mrb_value obj) { - return mrb_usascii_str_new2(mrb, "false"); + return mrb_str_new_cstr(mrb, "false"); } void |