diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-08-19 11:07:26 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-08-19 11:07:26 +0900 |
| commit | 32d0dbc8bf1daa3966c938a31f7380d53d352f11 (patch) | |
| tree | ad50e8ce74f59c80fcfa89d96e1db9ab6edbc208 | |
| parent | 70132ea1df66c2621c8730f7e61d2c8a049187d4 (diff) | |
| parent | 6dd9bb7c432341858b81690ad0817ef97129e040 (diff) | |
| download | mruby-32d0dbc8bf1daa3966c938a31f7380d53d352f11.tar.gz mruby-32d0dbc8bf1daa3966c938a31f7380d53d352f11.zip | |
Merge branch 'master' of github.com:mruby/mruby
| -rw-r--r-- | mrbgems/mruby-math/src/math.c | 4 | ||||
| -rw-r--r-- | src/variable.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mrbgems/mruby-math/src/math.c b/mrbgems/mruby-math/src/math.c index bdc7767f7..4960de6dd 100644 --- 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) { diff --git a/src/variable.c b/src/variable.c index 048b63bca..f2a474201 100644 --- 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; } /* |