From 09088d03ac235b062114831ac1e5bc85c34bb718 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 27 Dec 2017 10:25:32 +0000
Subject: [PATCH] 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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@61496 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 template/prelude.c.tmpl | 12 ++++++------
 version.h               |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/template/prelude.c.tmpl b/template/prelude.c.tmpl
index 72c8c7107b..11ec71f575 100644
--- a/template/prelude.c.tmpl
+++ b/template/prelude.c.tmpl
@@ -139,13 +139,13 @@ prelude_prefix_path(VALUE self)
 
 % 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 line)
 	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 line)
 				      NULL, ISEQ_TYPE_TOP, &optimization));
     rb_ast_dispose(ast);
 }
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
 % end
 
 % if @have_sublib
diff --git a/version.h b/version.h
index 821e6de0f5..6dc8f800bb 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #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"