diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-04-19 08:21:51 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-04-19 08:21:51 +0900 |
| commit | 0f31f16015dfa001381fa642a9e62ee2077dc020 (patch) | |
| tree | fab0efa5faa38451f79c276722d928d01ba47a67 | |
| parent | e79afd4c74a9677610ab95805fd0ffa4507410c7 (diff) | |
| parent | 09419874c8018830a53db1f5bec3ecadcb26c815 (diff) | |
| download | mruby-0f31f16015dfa001381fa642a9e62ee2077dc020.tar.gz mruby-0f31f16015dfa001381fa642a9e62ee2077dc020.zip | |
Merge pull request #2768 from kou/suppress-write-strings-warnings
Suppress warnings generated by -Wwrite-strings
| -rwxr-xr-x | mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c | 2 | ||||
| -rw-r--r-- | mrbgems/mruby-bin-mruby/tools/mruby/mruby.c | 2 | ||||
| -rw-r--r-- | mrbgems/mruby-string-ext/src/string.c | 2 | ||||
| -rw-r--r-- | src/fmt_fp.c | 2 | ||||
| -rw-r--r-- | tasks/toolchains/gcc.rake | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c index d4ec3d5f8..b913915c3 100755 --- a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c +++ b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c @@ -156,7 +156,7 @@ check_bptype(char* args) static void 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) { printf(BREAK_INFO_MSG_LINEBREAK, diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c index 442133f92..44ad9bb06 100644 --- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c +++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c @@ -209,7 +209,7 @@ main(int argc, char **argv) /* Set $0 */ zero_sym = mrb_intern_lit(mrb, "$0"); if (args.rfp) { - char *cmdline; + const char *cmdline; cmdline = args.cmdline ? args.cmdline : "-"; mrbc_filename(mrb, c, cmdline); mrb_gv_set(mrb, zero_sym, mrb_str_new_cstr(mrb, cmdline)); diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index 68d96cd6c..221de5009 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -253,7 +253,7 @@ mrb_str_succ_bang(mrb_state *mrb, mrb_value self) { mrb_value result; unsigned char *p, *e, *b, *t; - char *prepend; + const char *prepend; struct RString *s = mrb_str_ptr(self); size_t l; diff --git a/src/fmt_fp.c b/src/fmt_fp.c index a94503e63..9b29093a8 100644 --- a/src/fmt_fp.c +++ b/src/fmt_fp.c @@ -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; if (!isfinite(y)) { - char *ss = (t&32)?"inf":"INF"; + const char *ss = (t&32)?"inf":"INF"; if (y!=y) ss=(t&32)?"nan":"NAN"; pad(f, ' ', w, 3+pl, fl&~ZERO_PAD); out(f, prefix, pl); diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake index 7edf93642..fb1455812 100644 --- a/tasks/toolchains/gcc.rake +++ b/tasks/toolchains/gcc.rake @@ -1,7 +1,7 @@ MRuby::Toolchain.new(:gcc) do |conf| [conf.cc, conf.objc, conf.asm].each do |cc| 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.option_include_path = '-I%s' cc.option_define = '-D%s' |