Skip to content

Commit

Permalink
Avoid using C++ style comments (//).
Browse files Browse the repository at this point in the history
  • Loading branch information
matz committed May 30, 2017
1 parent 4b15d5d commit 27a5e10
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion include/mruby/class.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ mrb_class(mrb_state *mrb, mrb_value v)
}
}

// TODO: figure out where to put user flags
/* TODO: figure out where to put user flags */
#define MRB_FLAG_IS_FROZEN (1 << 18)
#define MRB_FLAG_IS_PREPENDED (1 << 19)
#define MRB_FLAG_IS_ORIGIN (1 << 20)
Expand Down
2 changes: 2 additions & 0 deletions include/mruby/numeric.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@ mrb_value mrb_num_div(mrb_state *mrb, mrb_value x, mrb_value y);
# define MRB_HAVE_TYPE_GENERIC_CHECKED_ARITHMETIC_BUILTINS
#endif

/*
// Clang 3.8 and 3.9 have problem compiling mruby in 32-bit mode, when MRB_INT64 is set
// because of missing __mulodi4 and similar functions in its runtime. We need to use custom
// implementation for them.
*/
#ifdef MRB_HAVE_TYPE_GENERIC_CHECKED_ARITHMETIC_BUILTINS
#if defined(__clang__) && (__clang_major__ == 3) && (__clang_minor__ >= 8) && \
defined(MRB_32BIT) && defined(MRB_INT64)
Expand Down
4 changes: 2 additions & 2 deletions src/class.c
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,7 @@ include_module_at(mrb_state *mrb, struct RClass *c, struct RClass *ins_pos, stru
if (p->tt == MRB_TT_ICLASS) {
if (p->mt == m->mt) {
if (!superclass_seen) {
ins_pos = p; // move insert point
ins_pos = p; /* move insert point */
}
goto skip;
}
Expand Down Expand Up @@ -1160,7 +1160,7 @@ mrb_mod_initialize(mrb_state *mrb, mrb_value mod)
{
mrb_value b;
struct RClass *m = mrb_class_ptr(mod);
boot_initmod(mrb, m); // bootstrap a newly initialized module
boot_initmod(mrb, m); /* bootstrap a newly initialized module */
mrb_get_args(mrb, "|&", &b);
if (!mrb_nil_p(b)) {
mrb_yield_with_class(mrb, b, 1, &mod, mod, m);
Expand Down

0 comments on commit 27a5e10

Please sign in to comment.