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

32d0dbc8 · Yukihiro "Matz" Matsumoto · 70132ea1 · 6dd9bb7c · 32d0dbc8 · 32d0dbc8
Commit 32d0dbc8 authored Aug 19, 2013 by Yukihiro "Matz" Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

mrbgems/mruby-math/src/math.c mrbgems/mruby-math/src/math.c +4 -0

src/variable.c src/variable.c +0 -1

No files found.
--- a/mrbgems/mruby-math/src/math.c
+++ b/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)
 {

--- a/src/variable.c
+++ b/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;
 }

 /*