Commit 0f31f160 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

Merge pull request #2768 from kou/suppress-write-strings-warnings

Suppress warnings generated by -Wwrite-strings
parents e79afd4c 09419874
...@@ -156,7 +156,7 @@ check_bptype(char* args) ...@@ -156,7 +156,7 @@ check_bptype(char* args)
static void static void
print_breakpoint(mrb_debug_breakpoint *bp) print_breakpoint(mrb_debug_breakpoint *bp)
{ {
char* enable_letter[] = {BREAK_INFO_MSG_DISABLE, BREAK_INFO_MSG_ENABLE}; const char* enable_letter[] = {BREAK_INFO_MSG_DISABLE, BREAK_INFO_MSG_ENABLE};
if(bp->type == MRB_DEBUG_BPTYPE_LINE) { if(bp->type == MRB_DEBUG_BPTYPE_LINE) {
printf(BREAK_INFO_MSG_LINEBREAK, printf(BREAK_INFO_MSG_LINEBREAK,
......
...@@ -209,7 +209,7 @@ main(int argc, char **argv) ...@@ -209,7 +209,7 @@ main(int argc, char **argv)
/* Set $0 */ /* Set $0 */
zero_sym = mrb_intern_lit(mrb, "$0"); zero_sym = mrb_intern_lit(mrb, "$0");
if (args.rfp) { if (args.rfp) {
char *cmdline; const char *cmdline;
cmdline = args.cmdline ? args.cmdline : "-"; cmdline = args.cmdline ? args.cmdline : "-";
mrbc_filename(mrb, c, cmdline); mrbc_filename(mrb, c, cmdline);
mrb_gv_set(mrb, zero_sym, mrb_str_new_cstr(mrb, cmdline)); mrb_gv_set(mrb, zero_sym, mrb_str_new_cstr(mrb, cmdline));
......
...@@ -253,7 +253,7 @@ mrb_str_succ_bang(mrb_state *mrb, mrb_value self) ...@@ -253,7 +253,7 @@ mrb_str_succ_bang(mrb_state *mrb, mrb_value self)
{ {
mrb_value result; mrb_value result;
unsigned char *p, *e, *b, *t; unsigned char *p, *e, *b, *t;
char *prepend; const char *prepend;
struct RString *s = mrb_str_ptr(self); struct RString *s = mrb_str_ptr(self);
size_t l; size_t l;
......
...@@ -121,7 +121,7 @@ fmt_fp(struct fmt_args *f, long double y, int w, int p, int fl, int t) ...@@ -121,7 +121,7 @@ fmt_fp(struct fmt_args *f, long double y, int w, int p, int fl, int t)
} else prefix++, pl=0; } else prefix++, pl=0;
if (!isfinite(y)) { if (!isfinite(y)) {
char *ss = (t&32)?"inf":"INF"; const char *ss = (t&32)?"inf":"INF";
if (y!=y) ss=(t&32)?"nan":"NAN"; if (y!=y) ss=(t&32)?"nan":"NAN";
pad(f, ' ', w, 3+pl, fl&~ZERO_PAD); pad(f, ' ', w, 3+pl, fl&~ZERO_PAD);
out(f, prefix, pl); out(f, prefix, pl);
......
MRuby::Toolchain.new(:gcc) do |conf| MRuby::Toolchain.new(:gcc) do |conf|
[conf.cc, conf.objc, conf.asm].each do |cc| [conf.cc, conf.objc, conf.asm].each do |cc|
cc.command = ENV['CC'] || 'gcc' cc.command = ENV['CC'] || 'gcc'
cc.flags = [ENV['CFLAGS'] || %w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement)] cc.flags = [ENV['CFLAGS'] || %w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement -Wwrite-strings)]
cc.defines = %w(DISABLE_GEMS) cc.defines = %w(DISABLE_GEMS)
cc.option_include_path = '-I%s' cc.option_include_path = '-I%s'
cc.option_define = '-D%s' cc.option_define = '-D%s'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment