summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-01-03 18:03:49 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-01-03 18:03:49 +0000
commitdc96b227d5df77f80098dc7172c91789673fa4d1 (patch)
treef984acc909009c46c0a0c5aad15646fec1a0bdb0
parent364f62a0610f3804a9cd109042ab36e950d65f33 (diff)
merge revision(s) 61479: [Backport #14236]
variable.c: public rb_autoload * variable.c (rb_autoload): restore the visibility for backward compatibility. [ruby-core:84454] [Bug #14236] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@61580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--variable.c2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/variable.c b/variable.c
index 10b885070c..0047338cb5 100644
--- a/variable.c
+++ b/variable.c
@@ -1882,7 +1882,7 @@ static const rb_data_type_t autoload_data_i_type = {
#define check_autoload_data(av) \
(struct autoload_data_i *)rb_check_typeddata((av), &autoload_data_i_type)
-void
+RUBY_FUNC_EXPORTED void
rb_autoload(VALUE mod, ID id, const char *file)
{
if (!file || !*file) {
diff --git a/version.h b/version.h
index eb6755c03b..b685933b09 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.0"
#define RUBY_RELEASE_DATE "2018-01-04"
-#define RUBY_PATCHLEVEL 2
+#define RUBY_PATCHLEVEL 3
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 1