summaryrefslogtreecommitdiffstatshomepage
path: root/py/builtintables.c
diff options
context:
space:
mode:
authorbvernoux <bvernoux@gmail.com>2014-06-03 19:26:34 +0200
committerbvernoux <bvernoux@gmail.com>2014-06-03 19:26:34 +0200
commit82560fce75ab0307182c943d564202e55fca6c09 (patch)
treed20162c8647ddb2451fdb76024761821b43149e8 /py/builtintables.c
parent0a1dbfe02f4a693c202b97aafcf0b5d0ba050812 (diff)
parentb294a7e3c9b84aad6c331128a51e0d69e7845141 (diff)
downloadmicropython-82560fce75ab0307182c943d564202e55fca6c09.tar.gz
micropython-82560fce75ab0307182c943d564202e55fca6c09.zip
Merge branch 'master' of https://github.com/micropython/micropython
Diffstat (limited to 'py/builtintables.c')
-rw-r--r--py/builtintables.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/py/builtintables.c b/py/builtintables.c
index 628514da1c..1041c2598c 100644
--- a/py/builtintables.c
+++ b/py/builtintables.c
@@ -172,7 +172,9 @@ STATIC const mp_map_elem_t mp_builtin_module_table[] = {
#endif
#if MICROPY_PY_BUILTINS_FLOAT
+#if MICROPY_PY_MATH
{ MP_OBJ_NEW_QSTR(MP_QSTR_math), (mp_obj_t)&mp_module_math },
+#endif
#if MICROPY_PY_CMATH
{ MP_OBJ_NEW_QSTR(MP_QSTR_cmath), (mp_obj_t)&mp_module_cmath },
#endif