Use C99 __func__ instead of __FUNCTION__; #5107

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)

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 {

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|