diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | enum.c | 3 | ||||
-rw-r--r-- | enumerator.c | 2 | ||||
-rw-r--r-- | internal.h | 2 |
4 files changed, 8 insertions, 3 deletions
@@ -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 @@ -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; diff --git a/enumerator.c b/enumerator.c index 081f93babc..0d7d45a36e 100644 --- a/enumerator.c +++ b/enumerator.c @@ -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 diff --git a/internal.h b/internal.h index 9bf66c2780..cb688f1897 100644 --- a/internal.h +++ b/internal.h @@ -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)); |