summaryrefslogtreecommitdiffhomepage
path: root/src/object.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-04-22 16:11:02 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2013-04-22 16:11:02 +0900
commit446b790ee37b37c1c3b1509ab8f20b947d82163f (patch)
treec0d654759d8cab2cf0b8a8f9db73fd69de789015 /src/object.c
parentc633f32b4151e372d96fdbb29eda13103ea56e45 (diff)
parent5b206d6907d56f158700d07c8f803a3c7b92b881 (diff)
downloadmruby-446b790ee37b37c1c3b1509ab8f20b947d82163f.tar.gz
mruby-446b790ee37b37c1c3b1509ab8f20b947d82163f.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src/object.c')
-rw-r--r--src/object.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/object.c b/src/object.c
index 23786e859..39a8825d2 100644
--- a/src/object.c
+++ b/src/object.c
@@ -111,7 +111,7 @@ nil_inspect(mrb_state *mrb, mrb_value obj)
static mrb_value
true_and(mrb_state *mrb, mrb_value obj)
{
- int obj2;
+ mrb_bool obj2;
mrb_get_args(mrb, "b", &obj2);
@@ -131,7 +131,7 @@ true_and(mrb_state *mrb, mrb_value obj)
static mrb_value
true_xor(mrb_state *mrb, mrb_value obj)
{
- int obj2;
+ mrb_bool obj2;
mrb_get_args(mrb, "b", &obj2);
return mrb_bool_value(!obj2);
@@ -171,7 +171,7 @@ true_to_s(mrb_state *mrb, mrb_value obj)
static mrb_value
true_or(mrb_state *mrb, mrb_value obj)
{
- int obj2;
+ mrb_bool obj2;
mrb_get_args(mrb, "b", &obj2);
return mrb_true_value();
@@ -202,7 +202,7 @@ true_or(mrb_state *mrb, mrb_value obj)
static mrb_value
false_and(mrb_state *mrb, mrb_value obj)
{
- int obj2;
+ mrb_bool obj2;
mrb_get_args(mrb, "b", &obj2);
return mrb_false_value();
@@ -224,7 +224,7 @@ false_and(mrb_state *mrb, mrb_value obj)
static mrb_value
false_xor(mrb_state *mrb, mrb_value obj)
{
- int obj2;
+ mrb_bool obj2;
mrb_get_args(mrb, "b", &obj2);
return mrb_bool_value(obj2);
@@ -244,7 +244,7 @@ false_xor(mrb_state *mrb, mrb_value obj)
static mrb_value
false_or(mrb_state *mrb, mrb_value obj)
{
- int obj2;
+ mrb_bool obj2;
mrb_get_args(mrb, "b", &obj2);
return mrb_bool_value(obj2);