summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-29 10:23:19 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-29 10:23:19 +0000
commitbf42e8f1c4a7216d608ecac6f839b8c43826b60f (patch)
tree28220cb649ef2d10b7d6ccfacc7efa6b1faaebb4
parent1c4533db62b8ae89fabd27143de3960c60abb5fd (diff)
downloadruby-bf42e8f1c4a7216d608ecac6f839b8c43826b60f.tar.gz
* enumerator.c: include internal.h instead of declaring the external
function there. git-svn-id: svn+ssh://svn.ruby-lang.org/ruby/branches/ruby_1_9_3@44749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk3
-rw-r--r--enumerator.c3
-rw-r--r--version.h2
4 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 47879d160d..8988570a13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 29 19:22:45 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * enumerator.c: include internal.h instead of declaring the external
+ function there.
+
Wed Jan 29 18:52:09 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* enumerator.c (enumerator_with_index_i): add the declaration of
diff --git a/common.mk b/common.mk
index e48cdc5776..b26ba729c3 100644
--- a/common.mk
+++ b/common.mk
@@ -619,7 +619,8 @@ encoding.$(OBJEXT): {$(VPATH)}encoding.c $(RUBY_H_INCLUDES) \
{$(VPATH)}internal.h
enum.$(OBJEXT): {$(VPATH)}enum.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
{$(VPATH)}util.h $(ID_H_INCLUDES)
-enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h
+enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES) \
+ {$(VPATH)}node.h {$(VPATH)}internal.h
error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}known_errors.inc \
$(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) $(ENCODING_H_INCLUDES) \
{$(VPATH)}debug.h \
diff --git a/enumerator.c b/enumerator.c
index 65247c90d5..bf0abf62f2 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -14,6 +14,7 @@
#include "ruby/ruby.h"
#include "node.h"
+#include "internal.h"
/*
* Document-class: Enumerator
@@ -366,8 +367,6 @@ enumerator_each(VALUE obj)
return enumerator_block_call(obj, 0, obj);
}
-extern VALUE rb_int_succ(VALUE);
-
static VALUE
enumerator_with_index_i(VALUE val, VALUE m, int argc, VALUE *argv)
{
diff --git a/version.h b/version.h
index 1c2329885f..f10aeae754 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 502
+#define RUBY_PATCHLEVEL 503
#define RUBY_RELEASE_DATE "2014-01-29"
#define RUBY_RELEASE_YEAR 2014