usa	2018-10-17 16:56:26 +0900 (Wed, 17 Oct 2018)

  New Revision: 65109

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

  Log:
    merge revision(s) 61323: [Backport #15069]
    
    suppress warning: 'const' attribute on function returning 'void'

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/include/ruby/intern.h
    branches/ruby_2_4/include/ruby/ruby.h
    branches/ruby_2_4/internal.h
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 65108)
+++ ruby_2_4/version.h	(revision 65109)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.5"
-#define RUBY_RELEASE_DATE "2018-09-06"
-#define RUBY_PATCHLEVEL 323
+#define RUBY_RELEASE_DATE "2018-10-17"
+#define RUBY_PATCHLEVEL 324
 
 #define RUBY_RELEASE_YEAR 2018
-#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 6
+#define RUBY_RELEASE_MONTH 10
+#define RUBY_RELEASE_DAY 17
 
 #include "ruby/version.h"
 
Index: ruby_2_4/include/ruby/intern.h
===================================================================
--- ruby_2_4/include/ruby/intern.h	(revision 65108)
+++ ruby_2_4/include/ruby/intern.h	(revision 65109)
@@ -254,9 +254,9 @@ NORETURN(DEPRECATED(PRINTF_ARGS(void rb_ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/include/ruby/intern.h#L254
 NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error_append(const char*, ...), 1, 2)));
 NORETURN(void rb_error_frozen(const char*));
 NORETURN(void rb_error_frozen_object(VALUE));
-CONSTFUNC(void rb_error_untrusted(VALUE));
+void rb_error_untrusted(VALUE);
 void rb_check_frozen(VALUE);
-CONSTFUNC(void rb_check_trusted(VALUE));
+void rb_check_trusted(VALUE);
 #define rb_check_frozen_internal(obj) do { \
 	VALUE frozen_obj = (obj); \
 	if (OBJ_FROZEN(frozen_obj)) { \
Index: ruby_2_4/include/ruby/ruby.h
===================================================================
--- ruby_2_4/include/ruby/ruby.h	(revision 65108)
+++ ruby_2_4/include/ruby/ruby.h	(revision 65109)
@@ -628,7 +628,7 @@ int ruby_safe_level_2_warning(void) __at https://github.com/ruby/ruby/blob/trunk/ruby_2_4/include/ruby/ruby.h#L628
 # define rb_set_safe_level(level) rb_set_safe_level(RUBY_SAFE_LEVEL_CHECK(level, error))
 #endif
 void rb_set_safe_level_force(int);
-CONSTFUNC(void rb_secure_update(VALUE));
+void rb_secure_update(VALUE);
 NORETURN(void rb_insecure_operation(void));
 
 VALUE rb_errinfo(void);
Index: ruby_2_4/internal.h
===================================================================
--- ruby_2_4/internal.h	(revision 65108)
+++ ruby_2_4/internal.h	(revision 65109)
@@ -965,7 +965,7 @@ VALUE rb_invcmp(VALUE, VALUE); https://github.com/ruby/ruby/blob/trunk/ruby_2_4/internal.h#L965
 struct rb_block;
 int rb_dvar_defined(ID, const struct rb_block *);
 int rb_local_defined(ID, const struct rb_block *);
-CONSTFUNC(const char * rb_insns_name(int i));
+const char * rb_insns_name(int i);
 VALUE rb_insns_name_array(void);
 
 /* complex.c */
@@ -988,7 +988,7 @@ void Init_ext(void); https://github.com/ruby/ruby/blob/trunk/ruby_2_4/internal.h#L988
 
 /* encoding.c */
 ID rb_id_encoding(void);
-CONSTFUNC(void rb_gc_mark_encodings(void));
+void rb_gc_mark_encodings(void);
 rb_encoding *rb_enc_get_from_index(int index);
 rb_encoding *rb_enc_check_str(VALUE str1, VALUE str2);
 int rb_encdb_replicate(const char *alias, const char *orig);
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 65108)
+++ ruby_2_4	(revision 65109)

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

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