Skip to content

Commit

Permalink
enum.c: prefix
Browse files Browse the repository at this point in the history
* enum.c (rb_enum_cycle_size): prefix with rb.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Nov 6, 2012
1 parent 7f00f85 commit db54dc7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Wed Nov 7 07:52:50 2012 Nobuyoshi Nakada <[email protected]>

* enum.c (rb_enum_cycle_size): prefix with rb.

Wed Nov 7 04:32:15 2012 Luis Lavena <[email protected]>

* test/ruby/test_file_exhaustive.rb: Remove FIXME skip on Windows
Expand Down
3 changes: 2 additions & 1 deletion enum.c
Original file line number Diff line number Diff line change
Expand Up @@ -2235,8 +2235,9 @@ cycle_i(VALUE i, VALUE ary, int argc, VALUE *argv)
return Qnil;
}

#define enum_cycle_size rb_enum_cycle_size
VALUE
enum_cycle_size(VALUE self, VALUE args)
rb_enum_cycle_size(VALUE self, VALUE args)
{
long mul;
VALUE n = Qnil;
Expand Down
2 changes: 1 addition & 1 deletion enumerator.c
Original file line number Diff line number Diff line change
Expand Up @@ -1745,7 +1745,7 @@ lazy_drop_while(VALUE obj)
static VALUE
lazy_cycle_size(VALUE lazy)
{
return enum_cycle_size(rb_ivar_get(lazy, id_receiver), rb_ivar_get(lazy, id_arguments));
return rb_enum_cycle_size(rb_ivar_get(lazy, id_receiver), rb_ivar_get(lazy, id_arguments));
}

static VALUE
Expand Down
2 changes: 1 addition & 1 deletion internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ ID rb_id_encoding(void);
void rb_gc_mark_encodings(void);

/* enum.c */
VALUE enum_cycle_size(VALUE self, VALUE args);
VALUE rb_enum_cycle_size(VALUE self, VALUE args);

/* error.c */
NORETURN(PRINTF_ARGS(void rb_compile_bug(const char*, int, const char*, ...), 3, 4));
Expand Down

0 comments on commit db54dc7

Please sign in to comment.