Fix CI build errors and warnings.

2 files changed, 4 insertions, 6 deletions

diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
index b1d95cd28..b494b13c9 100644
--- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
+++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
@@ -252,7 +252,7 @@ static char *
 dup_arg_item(mrb_state *mrb, const char *item)
 {
   size_t buflen = strlen(item) + 1;
-  char *buf = mrb_malloc(mrb, buflen);
+  char *buf = (char*)mrb_malloc(mrb, buflen);
   memcpy(buf, item, buflen);
   return buf;
 }
@@ -432,7 +432,6 @@ main(int argc, char **argv)
   mrb_bool code_block_open = FALSE;
   int ai;
   unsigned int stack_keep = 0;
-  FILE *lfp;
 
   /* new interpreter instance */
   mrb = mrb_open();
@@ -477,7 +476,7 @@ main(int argc, char **argv)
 
   /* Load libraries */
   for (i = 0; i < args.libc; i++) {
-    lfp = fopen(args.libv[i], "r");
+    FILE *lfp = fopen(args.libv[i], "r");
     if (lfp == NULL) {
       printf("Cannot open library file. (%s)\n", args.libv[i]);
       cleanup(mrb, &args);
diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
index 88824ce55..d9f90c5e1 100644
--- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
+++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
@@ -61,7 +61,7 @@ static char *
 dup_arg_item(mrb_state *mrb, const char *item)
 {
   size_t buflen = strlen(item) + 1;
-  char *buf = mrb_malloc(mrb, buflen);
+  char *buf = (char*)mrb_malloc(mrb, buflen);
   memcpy(buf, item, buflen);
   return buf;
 }
@@ -210,7 +210,6 @@ main(int argc, char **argv)
   mrbc_context *c;
   mrb_value v;
   mrb_sym zero_sym;
-  FILE *lfp;
 
   if (mrb == NULL) {
     fputs("Invalid mrb_state, exiting mruby\n", stderr);
@@ -257,7 +256,7 @@ main(int argc, char **argv)
 
     /* Load libraries */
     for (i = 0; i < args.libc; i++) {
-      lfp = fopen(args.libv[i], args.mrbfile ? "rb" : "r");
+      FILE *lfp = fopen(args.libv[i], args.mrbfile ? "rb" : "r");
       if (lfp == NULL) {
         printf("Cannot open library file. (%s)\n", args.libv[i]);
         cleanup(mrb, &args);