ruby-changes:49363
From: nobu <ko1@a...>
Date: Tue, 26 Dec 2017 09:00:04 +0900 (JST)
Subject: [ruby-changes:49363] nobu:r61478 (trunk): prelude.c.tmpl: get rid of errors with old gcc
nobu 2017-12-26 08:59:56 +0900 (Tue, 26 Dec 2017) New Revision: 61478 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=61478 Log: 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 files: trunk/template/prelude.c.tmpl Index: template/prelude.c.tmpl =================================================================== --- template/prelude.c.tmpl (revision 61477) +++ template/prelude.c.tmpl (revision 61478) @@ -139,13 +139,13 @@ prelude_prefix_path(VALUE self) https://github.com/ruby/ruby/blob/trunk/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/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/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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/