diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-11-03 18:03:23 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-11-03 18:03:23 +0900 |
| commit | 963b44286acf2e822130ef693a9891d06a3e4dfc (patch) | |
| tree | 90e08e268859ea53dac81472c30026a0594a3941 | |
| parent | b7e8406f6cf7f8f83fe9594d06c0861e4068241b (diff) | |
| download | mruby-963b44286acf2e822130ef693a9891d06a3e4dfc.tar.gz mruby-963b44286acf2e822130ef693a9891d06a3e4dfc.zip | |
Use C99 `__func__` instead of `__FUNCTION__`; #5107
| -rw-r--r-- | include/mruby.h | 4 | ||||
| -rw-r--r-- | mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.h | 4 | ||||
| -rw-r--r-- | mrbgems/mruby-test/mrbgem.rake | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/mruby.h b/include/mruby.h index 18dd311f7..6d03ba79c 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -53,6 +53,10 @@ #endif #endif +#ifdef _MSC_VER +# define __func__ __FUNCTION__ +#endif + #ifdef MRB_DEBUG #include <assert.h> #define mrb_assert(p) assert(p) diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.h b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.h index 0c6505737..24ccad126 100644 --- a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.h +++ b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.h @@ -10,10 +10,6 @@ #include "mrdbconf.h" -#ifdef _MSC_VER -# define __func__ __FUNCTION__ -#endif - #define MAX_COMMAND_WORD (16) typedef enum debug_command_id { diff --git a/mrbgems/mruby-test/mrbgem.rake b/mrbgems/mruby-test/mrbgem.rake index 0df683f7f..cff4278b8 100644 --- a/mrbgems/mruby-test/mrbgem.rake +++ b/mrbgems/mruby-test/mrbgem.rake @@ -81,7 +81,7 @@ MRuby::Gem::Specification.new('mruby-test') do |spec| f.puts %Q[ ai = mrb_gc_arena_save(mrb);] f.puts %Q[ mrb2 = mrb_open_core(mrb_default_allocf, NULL);] f.puts %Q[ if (mrb2 == NULL) {] - f.puts %Q[ fprintf(stderr, "Invalid mrb_state, exiting \%s", __FUNCTION__);] + f.puts %Q[ fprintf(stderr, "Invalid mrb_state, exiting \%s", __func__);] f.puts %Q[ exit(EXIT_FAILURE);] f.puts %Q[ }] dep_list.each do |d| |