naruse	2018-01-04 03:03:49 +0900 (Thu, 04 Jan 2018)

  New Revision: 61580

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=61580

  Log:
    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]

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/variable.c
    branches/ruby_2_5/version.h
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 61579)
+++ ruby_2_5/version.h	(revision 61580)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #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
Index: ruby_2_5/variable.c
===================================================================
--- ruby_2_5/variable.c	(revision 61579)
+++ ruby_2_5/variable.c	(revision 61580)
@@ -1882,7 +1882,7 @@ static const rb_data_type_t autoload_dat https://github.com/ruby/ruby/blob/trunk/ruby_2_5/variable.c#L1882
 #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) {
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 61579)
+++ ruby_2_5	(revision 61580)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r61479

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/