summaryrefslogtreecommitdiff
path: root/src/lmathlib.c
diff options
context:
space:
mode:
authorLua Team <team@lua.org>2015-06-03 12:00:00 +0000
committerrepogen <>2015-06-03 12:00:00 +0000
commit6ddf2b3ca86471f90439976967c9e608582f0d0b (patch)
tree7fa563fe4062fcea38b86adfe8a26ac413f0d97b /src/lmathlib.c
parent34c362812ab38172d3da36404ec9a85f929579c5 (diff)
downloadlua-github-5.3.1-rc1.tar.gz
Lua 5.3.1-rc15.3.1-rc1
Diffstat (limited to 'src/lmathlib.c')
-rw-r--r--src/lmathlib.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lmathlib.c b/src/lmathlib.c
index 002c508b..4f2ec60a 100644
--- a/src/lmathlib.c
+++ b/src/lmathlib.c
@@ -1,5 +1,5 @@
/*
-** $Id: lmathlib.c,v 1.114 2014/12/27 20:32:26 roberto Exp $
+** $Id: lmathlib.c,v 1.115 2015/03/12 14:04:04 roberto Exp $
** Standard mathematical library
** See Copyright Notice in lua.h
*/
@@ -183,6 +183,9 @@ static int math_log (lua_State *L) {
res = l_mathop(log)(x);
else {
lua_Number base = luaL_checknumber(L, 2);
+#if !defined(LUA_USE_C89)
+ if (base == 2.0) res = l_mathop(log2)(x); else
+#endif
if (base == 10.0) res = l_mathop(log10)(x);
else res = l_mathop(log)(x)/l_mathop(log)(base);
}