Merge branch 'master' of github.com:mruby/mruby

mrbgems/mruby-math/src/math.c

@@ -87,6 +87,10 @@ erfc(double x)
   return one_sqrtpi*exp(-x*x)*q2;
 }
 
+#endif
+
+#if (defined _MSC_VER && _MSC_VER < 1800) || defined __ANDROID__
+
 double
 log2(double x)
 {

src/variable.c

@@ -118,7 +118,6 @@ iv_put(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value val)
   else {
     t->rootseg = seg;
   }
-  return;
 }
 
 /*