summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--include/mruby/boxing_word.h12
-rw-r--r--src/etc.c6
2 files changed, 9 insertions, 9 deletions
diff --git a/include/mruby/boxing_word.h b/include/mruby/boxing_word.h
index 9984a5e22..6057311a8 100644
--- a/include/mruby/boxing_word.h
+++ b/include/mruby/boxing_word.h
@@ -43,11 +43,11 @@ typedef union mrb_value {
unsigned long w;
} mrb_value;
-mrb_value word_boxing_mrb_cptr_value(struct mrb_state*, void*);
-mrb_value word_boxing_mrb_float_value(struct mrb_state*, mrb_float);
-mrb_value word_boxing_mrb_float_pool(struct mrb_state*, mrb_float);
+mrb_value mrb_word_boxing_cptr_value(struct mrb_state*, void*);
+mrb_value mrb_word_boxing_float_value(struct mrb_state*, mrb_float);
+mrb_value mrb_word_boxing_float_pool(struct mrb_state*, mrb_float);
-#define mrb_float_pool(mrb,f) word_boxing_mrb_float_pool(mrb,f)
+#define mrb_float_pool(mrb,f) mrb_word_boxing_float_pool(mrb,f)
#define mrb_ptr(o) (o).value.p
#define mrb_cptr(o) (o).value.vp->p
@@ -94,8 +94,8 @@ mrb_type(mrb_value o)
}\
} while (0)
-#define SET_FLOAT_VALUE(mrb,r,v) r = word_boxing_mrb_float_value(mrb, v)
-#define SET_CPTR_VALUE(mrb,r,v) r = word_boxing_mrb_cptr_value(mrb, v)
+#define SET_FLOAT_VALUE(mrb,r,v) r = mrb_word_boxing_float_value(mrb, v)
+#define SET_CPTR_VALUE(mrb,r,v) r = mrb_word_boxing_cptr_value(mrb, v)
#define SET_NIL_VALUE(r) BOXWORD_SET_VALUE(r, MRB_TT_FALSE, value.i, 0)
#define SET_FALSE_VALUE(r) BOXWORD_SET_VALUE(r, MRB_TT_FALSE, value.i, 1)
#define SET_TRUE_VALUE(r) BOXWORD_SET_VALUE(r, MRB_TT_TRUE, value.i, 1)
diff --git a/src/etc.c b/src/etc.c
index 269374b42..95f55fc82 100644
--- a/src/etc.c
+++ b/src/etc.c
@@ -148,7 +148,7 @@ mrb_obj_id(mrb_value obj)
#ifdef MRB_WORD_BOXING
mrb_value
-word_boxing_mrb_float_value(mrb_state *mrb, mrb_float f)
+mrb_word_boxing_float_value(mrb_state *mrb, mrb_float f)
{
mrb_value v;
@@ -158,7 +158,7 @@ word_boxing_mrb_float_value(mrb_state *mrb, mrb_float f)
}
mrb_value
-word_boxing_mrb_float_pool(mrb_state *mrb, mrb_float f)
+mrb_word_boxing_float_pool(mrb_state *mrb, mrb_float f)
{
struct RFloat *nf = (struct RFloat *)mrb_malloc(mrb, sizeof(struct RFloat));
nf->tt = MRB_TT_FLOAT;
@@ -168,7 +168,7 @@ word_boxing_mrb_float_pool(mrb_state *mrb, mrb_float f)
}
mrb_value
-word_boxing_mrb_cptr_value(mrb_state *mrb, void *p)
+mrb_word_boxing_cptr_value(mrb_state *mrb, void *p)
{
mrb_value v;