naruse	2017-12-27 19:25:32 +0900 (Wed, 27 Dec 2017)

  New Revision: 61496

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

  Log:
    merge revision(s) 61478: [Backport #14234]
    
    prelude.c.tmpl: get rid of errors with old gcc
    
    * template/prelude.c.tmpl: moved diagnostic pragmas outside
      prelude_eval() for very old gcc.  [ruby-core:84449] [Bug #14234]

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/template/prelude.c.tmpl
    branches/ruby_2_5/version.h
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 61495)
+++ ruby_2_5/version.h	(revision 61496)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.0"
-#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 0
+#define RUBY_RELEASE_DATE "2017-12-27"
+#define RUBY_PATCHLEVEL 1
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"
 
Index: ruby_2_5/template/prelude.c.tmpl
===================================================================
--- ruby_2_5/template/prelude.c.tmpl	(revision 61495)
+++ ruby_2_5/template/prelude.c.tmpl	(revision 61496)
@@ -139,13 +139,13 @@ prelude_prefix_path(VALUE self) https://github.com/ruby/ruby/blob/trunk/ruby_2_5/template/prelude.c.tmpl#L139
 
 % unless preludes.empty?
 #define PRELUDE_STR(n) rb_usascii_str_new_static(prelude_##n.L0, sizeof(prelude_##n))
-static void
-prelude_eval(VALUE code, VALUE name, int line)
-{
 #ifdef __GNUC__
 # pragma GCC diagnostic push
 # pragma GCC diagnostic error "-Wmissing-field-initializers"
 #endif
+static void
+prelude_eval(VALUE code, VALUE name, int line)
+{
     static const rb_compile_option_t optimization = {
 	TRUE, /* int inline_const_cache; */
 	TRUE, /* int peephole_optimization; */
@@ -159,9 +159,6 @@ prelude_eval(VALUE code, VALUE name, int https://github.com/ruby/ruby/blob/trunk/ruby_2_5/template/prelude.c.tmpl#L159
 	FALSE, /* unsigned int coverage_enabled; */
 	0, /* int debug_level; */
     };
-#ifdef __GNUC__
-# pragma GCC diagnostic pop
-#endif
 
     rb_ast_t *ast = rb_parser_compile_string_path(rb_parser_new(), name, code, line);
     if (!ast->root) {
@@ -172,6 +169,9 @@ prelude_eval(VALUE code, VALUE name, int https://github.com/ruby/ruby/blob/trunk/ruby_2_5/template/prelude.c.tmpl#L169
 				      NULL, ISEQ_TYPE_TOP, &optimization));
     rb_ast_dispose(ast);
 }
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
 % end
 
 % if @have_sublib
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 61495)
+++ ruby_2_5	(revision 61496)

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

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